diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-09-26 19:05:54 (GMT) |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-09-26 19:05:54 (GMT) |
| commit | 17deb9c2db01c7813611291d251d8c7dbdfd3c9d (patch) | |
| tree | 6e023c0be7c64de84dd51a671eb09c5c82b56615 /include/linux/clockchips.h | |
| parent | f4e6e1ea19737077d958f2bc6c196eb579d97544 (diff) | |
| parent | 389e067032fbb96e439abafae848dd447e4cafb4 (diff) | |
| download | linux-fsl-qoriq-17deb9c2db01c7813611291d251d8c7dbdfd3c9d.tar.xz | |
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>
Diffstat (limited to 'include/linux/clockchips.h')
0 files changed, 0 insertions, 0 deletions