From: John Stultz <john.stultz@linaro.org>
Date: Thu, 26 Sep 2013 19:05:54 +0000 (-0700)
Subject: Merge remote-tracking branch 'tip/timers/core' into fordlezcano/3.13/sched-clock64... 
X-Git-Tag: omap-for-v3.13/fixes-for-merge-window-take2~39^2~11^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17deb9c2db01c7813611291d251d8c7dbdfd3c9d;p=pandora-kernel.git

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

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>
---

17deb9c2db01c7813611291d251d8c7dbdfd3c9d
Reading git-diff-tree failed