diff options
| author |   John Stultz <john.stultz@linaro.org> | 2013-09-16 18:52:52 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-09-16 18:52:52 -0700 |
| commit | 19c3205ceaffc8f860acf61537fa211087e4b8fc (patch) | |
| tree | 36a232e278c4d7f8d893ba211aec7c8d07743e09 /drivers/clocksource/samsung_pwm_timer.c | |
| parent | Linux 3.12-rc1 (diff) | |
| parent | sched_clock: Add support for >32 bit sched_clock (diff) | |
| download | wireguard-linux-19c3205ceaffc8f860acf61537fa211087e4b8fc.tar.xz wireguard-linux-19c3205ceaffc8f860acf61537fa211087e4b8fc.zip | |
Merge branch 'fortglx/3.12/sched-clock64-base' into fortglx/3.13/time
Merge in 64bit sched_clock support that missed 3.12.
Conflicts:
kernel/time/sched_clock.c
Signed-off-by: John.Stultz <john.stultz@linaro.org>
Diffstat (limited to 'drivers/clocksource/samsung_pwm_timer.c')
0 files changed, 0 insertions, 0 deletions