| commit | 17deb9c2db01c7813611291d251d8c7dbdfd3c9d | [log] [tgz] |
|---|---|---|
| author | John Stultz <john.stultz@linaro.org> | Thu Sep 26 12:05:54 2013 -0700 |
| committer | John Stultz <john.stultz@linaro.org> | Thu Sep 26 12:05:54 2013 -0700 |
| tree | 6e023c0be7c64de84dd51a671eb09c5c82b56615 | |
| parent | f4e6e1ea19737077d958f2bc6c196eb579d97544 [diff] | |
| parent | 389e067032fbb96e439abafae848dd447e4cafb4 [diff] |
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>