diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-07-28 21:49:22 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-07-28 21:49:22 +0200 |
| commit | 47916be4e28c3d6fdb97dd8fb887d1d9b3145b9d (patch) | |
| tree | 3b2259ee965cbe70c4ce9325d0e0def9bc061d97 /include/media/v4l2-int-device.h | |
| parent | clocksource: Add __clocksource_updatefreq_hz/khz methods (diff) | |
| parent | powerpc: Clean up obsolete code relating to decrementer and timebase (diff) | |
| download | linux-47916be4e28c3d6fdb97dd8fb887d1d9b3145b9d.tar.xz linux-47916be4e28c3d6fdb97dd8fb887d1d9b3145b9d.zip | |
Merge branch 'powerpc.cherry-picks' into timers/clocksource
Conflicts:
arch/powerpc/kernel/time.c
Reason: The powerpc next tree contains two commits which conflict with
the timekeeping changes:
8fd63a9e powerpc: Rework VDSO gettimeofday to prevent time going backwards
c1aa687d powerpc: Clean up obsolete code relating to decrementer and timebase
John Stultz identified them and provided the conflict resolution.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/media/v4l2-int-device.h')
0 files changed, 0 insertions, 0 deletions