| commit | 47916be4e28c3d6fdb97dd8fb887d1d9b3145b9d | [log] [tgz] |
|---|---|---|
| author | Thomas Gleixner <tglx@linutronix.de> | Wed Jul 28 21:49:22 2010 +0200 |
| committer | Thomas Gleixner <tglx@linutronix.de> | Wed Jul 28 21:49:22 2010 +0200 |
| tree | 3b2259ee965cbe70c4ce9325d0e0def9bc061d97 | |
| parent | 852db46d55e85b475a72e665ca08d3317769ceef [diff] | |
| parent | d75d68cfef4936ddf38d2694ae2f7d1f7c45db05 [diff] |
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>