Ingo Molnar 45ab6b0c76 Merge branch 'sched/core' into cpus4096 ... Conflicts: include/linux/ftrace.h kernel/sched.c		2008-12-12 13:48:57 +01:00
..
boot	powerpc/83xx: Fix MCU support merge issue in mpc8349emitx.dts	2008-12-03 09:56:02 -06:00
configs	powerpc/83xx: Enable FIXED_PHY in mpc834x_itx and mpc83xx defconfigs	2008-12-04 18:47:09 -06:00
include/asm	Merge branch 'tracing/fastboot' into cpus4096	2008-12-12 12:43:05 +01:00
kernel	Merge branch 'sched/core' into cpus4096	2008-12-12 13:48:57 +01:00
kvm	KVM: ppc: stop leaking host memory on VM exit	2008-11-25 12:02:48 +02:00
lib	powerpc/ppc32: static ftrace fixes for PPC32	2008-11-28 14:08:07 +01:00
math-emu
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: Use physical cpu id when setting the processor affinity	2008-12-02 15:50:40 -08: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
Makefile	ftrace: rename FTRACE to FUNCTION_TRACER	2008-10-20 18:27:03 +02:00