Thomas Gleixner f384c954c9 Merge branch 'linus' into perf/core ... Reason: Further changes conflict with upstream fixes Signed-off-by: Thomas Gleixner <tglx@linutronix.de>		2010-06-28 22:33:24 +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	Merge branch 'linus' into perf/core	2010-06-28 22:33:24 +02:00
kernel	Merge branch 'linus' into perf/core	2010-06-28 22:33:24 +02:00
kvm	KVM: powerpc: fix init/exit annotation	2010-06-09 18:39:09 +03:00
lib	powerpc: Fix string library functions	2010-05-21 17:31:08 +10:00
math-emu	powerpc/math-emu: Fix efp dependence	2009-03-11 06:00:08 -05:00
mm	powerpc: Remove dead CONFIG_HIGHPTE	2010-06-15 15:02:32 +10:00
oprofile	powerpc/oprofile: fix potential buffer overrun in op_model_cell.c	2010-06-07 11:18:56 +02:00
platforms	powerpc/5200: fix oops during going to standby	2010-06-15 14:47:04 -06:00
sysdev	powerpc: Fix mpic_resume on early G5 macs	2010-06-15 15:02:37 +10:00
xmon	powerpc: Mark some variables in the page fault path __read_mostly	2010-02-03 17:39:48 +11:00
Kconfig	Merge commit 'kumar/next' into next	2010-05-31 10:01:50 +10:00
Kconfig.debug	powerpc: Unconditionally enabled irq stacks	2010-06-15 15:02:37 +10:00
Makefile	kbuild: move -fno-dwarf2-cfi-asm to powerpc only	2010-02-05 23:21:18 +01:00
relocs_check.pl	powerpc: Check for unsupported relocs when using CONFIG_RELOCATABLE	2009-09-24 15:31:40 +10:00