Thomas Gleixner 47916be4e2 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>

2010-07-28 21:49:22 +02:00

29 KiB

Raw Blame History

View Raw