drivers/clocksource/samsung_pwm_timer.c · 87093826aa0172d9135ca1f301c4298a258ceee6 · Kirill Smelkov / linux

Merge remote-tracking branch 'tip/timers/core' into fordlezcano/3.13/sched-clock64-conversion · 17deb9c2

John Stultz authored Sep 26, 2013

Update to tip/timers/core and resolve minor conflict.

Conflicts:
	drivers/clocksource/samsung_pwm_timer.c
Signed-off-by: John Stultz <john.stultz@linaro.org>

17deb9c2

samsung_pwm_timer.c 12.6 KB

Replace samsung_pwm_timer.c