diff options
| author |   John Stultz <john.stultz@linaro.org> | 2012-09-28 18:00:27 -0400 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2012-09-28 18:00:27 -0400 |
| commit | 28f2b02bc581ffc835bc1691b18d03f62fcf0395 (patch) | |
| tree | 94205c22ecc0c1d0a792f610cfd7e63967227ea8 /kernel/timer.c | |
| parent | time: Convert x86_64 to using new update_vsyscall (diff) | |
| parent | time/jiffies: bring back unconditional LATCH definition (diff) | |
| download | linux-dev-28f2b02bc581ffc835bc1691b18d03f62fcf0395.tar.xz linux-dev-28f2b02bc581ffc835bc1691b18d03f62fcf0395.zip | |
Merge branch 'arnds-jiffies-fix' into fortglx/3.7/time
Sort out conflict with Arnd's patch that preserves
the unconditional LATCH value.
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'kernel/timer.c')
0 files changed, 0 insertions, 0 deletions