From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 28 Jul 2010 19:49:22 +0000 (+0200)
Subject: Merge branch 'powerpc.cherry-picks' into timers/clocksource
X-Git-Tag: v2.6.36-rc1~514^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47916be4e28c3d6fdb97dd8fb887d1d9b3145b9d;p=pandora-kernel.git

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>
---

47916be4e28c3d6fdb97dd8fb887d1d9b3145b9d
Reading git-diff-tree failed