]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2ff4bdd 7ce415a)
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)
commitc83a020705e9c2e16af0c5da54c2db9303f9943e
tree3b2259ee965cbe70c4ce9325d0e0def9bc061d97tree | snapshot
parent2ff4bddb6c7c548fd5608fd5a1d0feec0522f647commit | diff
parent7ce415aee92fa1c74ef863efe984706a68104675commit | 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:

efa49a34 powerpc: Rework VDSO gettimeofday to prevent time going backwards
a753e4e2 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
Linux Kernel Source Tree.