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

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