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
..
boot	Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6	2010-06-27 07:30:25 -07:00
configs	powerpc: Disable CONFIG_SYSFS_DEPRECATED	2010-06-15 15:02:33 +10:00
include/asm	powerpc: Clean up obsolete code relating to decrementer and timebase	2010-07-28 21:07:12 +02:00
kernel	Merge branch 'powerpc.cherry-picks' into timers/clocksource	2010-07-28 21:49:22 +02:00
kvm	KVM: powerpc: fix init/exit annotation	2010-06-09 18:39:09 +03:00
lib	powerpc: Fix feature-fixup tests for gcc 4.5	2010-07-08 18:11:41 +10:00
math-emu	powerpc/math-emu: Fix efp dependence	2009-03-11 06:00:08 -05:00
mm	powerpc: Fix erroneous lmb->memblock conversions	2010-07-23 12:56:57 +10:00
oprofile	powerpc/oprofile: fix potential buffer overrun in op_model_cell.c	2010-06-07 11:18:56 +02:00
platforms	powerpc: Clean up obsolete code relating to decrementer and timebase	2010-07-28 21:07:12 +02:00
sysdev	Merge branch 'lmb-to-memblock' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2010-07-14 17:27:44 -07:00
xmon	powerpc: Mark some variables in the page fault path __read_mostly	2010-02-03 17:39:48 +11:00
Kconfig	time: Kill off CONFIG_GENERIC_TIME	2010-07-27 12:40:54 +02:00
Kconfig.debug	powerpc: Unconditionally enabled irq stacks	2010-06-15 15:02:37 +10:00
Makefile	powerpc: Fix module building for gcc 4.5 and 64 bit	2010-07-08 18:11:38 +10:00
relocs_check.pl	powerpc: Check for unsupported relocs when using CONFIG_RELOCATABLE	2009-09-24 15:31:40 +10:00