Mike Travis 7eb1955336 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask into merge-rr-cpumask ... Conflicts: arch/x86/kernel/io_apic.c kernel/rcuclassic.c kernel/sched.c kernel/time/tick-sched.c Signed-off-by: Mike Travis <travis@sgi.com> [ mingo@elte.hu: backmerged typo fix for io_apic.c ] Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-01-03 18:53:31 +01:00
..
boot	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	2008-12-28 16:54:33 -08:00
configs	Merge branch 'next' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into next	2008-12-17 11:01:43 +11:00
include/asm	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask into merge-rr-cpumask	2009-01-03 18:53:31 +01:00
kernel	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-12-30 08:02:35 +10:30
kvm	powerpc: Fix KVM build on ppc440	2008-12-23 14:58:30 +11:00
lib	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	2008-12-28 16:54:33 -08:00
math-emu	powerpc: Add SPE/EFP math emulation for E500v1/v2 processors.	2008-12-03 08:19:16 -06:00
mm	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	2008-12-28 16:54:33 -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	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-12-31 23:05:57 +10:30
sysdev	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-12-30 08:02:35 +10:30
xmon	powerpc: Prepare xmon_save_regs for use with kdump	2008-12-23 15:13:28 +11:00
Kconfig	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	2008-12-28 16:54:33 -08:00
Kconfig.debug	powerpc: Allow the max stack trace depth to be configured	2008-12-03 20:46:35 +11:00
Makefile	powerpc: Remove unncessary SPE related compiler flag	2008-12-03 08:19:10 -06:00