Ingo Molnar 8302294f43 Merge branch 'tracing/core-v2' into tracing-for-linus ... Conflicts: include/linux/slub_def.h lib/Kconfig.debug mm/slob.c mm/slub.c		2009-04-02 00:49:02 +02:00
..
boot	x86, setup: fix the setting of 480-line VGA modes	2009-03-18 16:54:05 -07:00
configs	Merge branches 'x86/apic', 'x86/defconfig', 'x86/memtest', 'x86/mm' and 'linus' into x86/core	2009-02-26 06:31:32 +01:00
crypto
ia32	Merge branch 'linus' into percpu-cpumask-x86-for-linus-2	2009-03-28 04:26:01 +01:00
include/asm	Merge branch 'tracing/core-v2' into tracing-for-linus	2009-04-02 00:49:02 +02:00
kernel	Merge branch 'tracing/core-v2' into tracing-for-linus	2009-04-02 00:49:02 +02:00
kvm	Merge branch 'tracing/core-v2' into tracing-for-linus	2009-04-02 00:49:02 +02:00
lguest	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest-and-virtio	2009-03-30 17:57:39 -07:00
lib	x86: memcpy, clean up	2009-03-12 12:21:17 +01:00
math-emu	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	2009-03-27 17:28:43 +01:00
mm	Merge branch 'tracing/core-v2' into tracing-for-linus	2009-04-02 00:49:02 +02:00
oprofile	x86: oprofile: don't set counter width from cpuid on Core2	2009-03-03 12:04:22 +01:00
pci	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2009-04-01 09:47:12 -07:00
power	pm: rework includes, remove arch ifdefs	2009-04-01 08:59:16 -07:00
vdso	x86, mm: rename TASK_SIZE64 => TASK_SIZE_MAX	2009-02-21 00:09:44 +01:00
video
xen	x86: with the last user gone, remove set_pte_present	2009-03-19 14:04:19 +01:00
Kconfig	Merge branch 'tracing/core-v2' into tracing-for-linus	2009-04-02 00:49:02 +02:00
Kconfig.cpu	x86/centaur: merge 32 & 64 bit version	2009-03-14 16:27:29 +01:00
Kconfig.debug	generic debug pagealloc	2009-04-01 08:59:13 -07:00
Makefile	x86: use targets in the boot Makefile instead of CLEAN_FILES	2009-03-12 13:43:14 -07:00
Makefile_32.cpu