Ingo Molnar 30cd324e97 Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' into tracing/core ... Conflicts: include/linux/ftrace.h		2008-12-19 09:42:40 +01:00
..
boot	powerpc/40x: Add proper BOOTCFLAGS for cuboot-acadia	2008-12-11 07:34:22 -05:00
configs	powerpc/83xx: Enable FIXED_PHY in mpc834x_itx and mpc83xx defconfigs	2008-12-04 18:47:09 -06:00
include/asm	Merge branches 'tracing/ftrace', 'tracing/function-graph-tracer' and 'tracing/urgent' into tracing/core	2008-12-05 14:45:22 +01:00
kernel	Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' into tracing/core	2008-12-19 09:42:40 +01:00
kvm	KVM: ppc: stop leaking host memory on VM exit	2008-11-25 12:02:48 +02:00
lib	Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' into tracing/core	2008-12-19 09:42:40 +01:00
math-emu
mm	powerpc: Fix bootmem reservation on uninitialized node	2008-12-16 13:48:18 +11: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/axon-msi: Fix MSI after kexec	2008-12-16 13:48: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	Merge commit 'v2.6.28-rc2' into tracing/urgent	2008-10-27 10:50:54 +01:00
Kconfig.debug
Makefile