]> bbs.cooldavid.org Git - net-next-2.6.git/commit
git://bbs.cooldavid.org / net-next-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 852db46 d75d68c)
Merge branch 'powerpc.cherry-picks' into timers/clocksource
authorThomas Gleixner <tglx@linutronix.de>
Wed, 28 Jul 2010 19:49:22 +0000 (21:49 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 28 Jul 2010 19:49:22 +0000 (21:49 +0200)
commit47916be4e28c3d6fdb97dd8fb887d1d9b3145b9d
tree3b2259ee965cbe70c4ce9325d0e0def9bc061d97tree | snapshot (tar.bz2 tar.gz zip)
parent852db46d55e85b475a72e665ca08d3317769ceefcommit | diff
parentd75d68cfef4936ddf38d2694ae2f7d1f7c45db05commit | 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>
arch/powerpc/kernel/time.c diff1 | diff2 | blob | history
Clone of davem's net-next-2.6 tree