Ingo Molnar a64d31baed Merge branch 'linus' into cpus4096 ... Conflicts: kernel/trace/ring_buffer.c		2008-12-02 20:09:50 +01:00
..
boot	powerpc/mpc832x_rdb: fix swapped ethernet ids	2008-11-19 15:12:19 -06:00
configs	Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into merge	2008-11-24 11:53:44 +11:00
include/asm	Merge branch 'linus' into cpus4096	2008-12-02 20:09:50 +01:00
kernel	Merge branch 'linus' into cpus4096	2008-12-02 20:09:50 +01:00
kvm	KVM: switch to get_user_pages_fast	2008-10-15 14:25:06 +02:00
lib	powerpc: Fix DMA offset for non-coherent DMA	2008-10-14 10:35:26 +11:00
math-emu	powerpc/math-emu: Use kernel generic math-emu code	2008-10-01 08:40:07 -05:00
mm	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	2008-11-30 16:44:18 -08:00
oprofile	powerpc/cell/OProfile: Fix on-stack array size in activate spu profiling function	2008-10-31 16:13:51 +11:00
platforms	powerpc/cell: Fix GDB watchpoints, again	2008-12-01 09:40:18 +11:00
sysdev	powerpc/mpic: Don't reset affinity for secondary MPIC on boot	2008-12-01 09:40:18 +11:00
xmon	powerpc: Fix compile errors with CONFIG_BUG=n	2008-10-31 21:34:09 +11:00
Kconfig	sched: rename SCHED_NO_NO_OMIT_FRAME_POINTER => SCHED_OMIT_FRAME_POINTER	2008-11-11 08:59:20 +01:00
Kconfig.debug	powerpc: Split-out common MSI bitmap logic into msi_bitmap.c	2008-08-20 16:34:57 +10:00
Makefile	ftrace: rename FTRACE to FUNCTION_TRACER	2008-10-20 18:27:03 +02:00