Robert Richter 5a289395bf Merge branch 'oprofile/x86-oprofile-for-tip' into oprofile/oprofile-for-tip ... Conflicts: arch/x86/oprofile/op_model_ppro.c		2008-10-15 22:19:41 +02:00
..
boot	Merge branches 'x86/xen', 'x86/build', 'x86/microcode', 'x86/mm-debug-v2', 'x86/memory-corruption-check', 'x86/early-printk', 'x86/xsave', 'x86/ptrace-v2', 'x86/quirks', 'x86/setup', 'x86/spinlocks' and 'x86/signal' into x86/core-v2	2008-10-12 15:50:02 +02:00
configs	Merge branches 'x86/xen', 'x86/build', 'x86/microcode', 'x86/mm-debug-v2', 'x86/memory-corruption-check', 'x86/early-printk', 'x86/xsave', 'x86/ptrace-v2', 'x86/quirks', 'x86/setup', 'x86/spinlocks' and 'x86/signal' into x86/core-v2	2008-10-12 15:50:02 +02:00
crypto
ia32	Merge branch 'linus' into x86/signal	2008-10-12 12:49:27 +02:00
kernel	Merge branch 'linus' into oprofile	2008-10-13 10:52:30 +02:00
kvm	Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D	2008-10-11 20:23:20 +02:00
lguest
lib	Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D	2008-10-11 20:23:20 +02:00
mach-default
mach-generic
mach-rdc321x
mach-voyager
math-emu
mm	Merge branches 'x86/xen', 'x86/build', 'x86/microcode', 'x86/mm-debug-v2', 'x86/memory-corruption-check', 'x86/early-printk', 'x86/xsave', 'x86/ptrace-v2', 'x86/quirks', 'x86/setup', 'x86/spinlocks' and 'x86/signal' into x86/core-v2	2008-10-12 15:50:02 +02:00
oprofile	Merge branch 'oprofile/x86-oprofile-for-tip' into oprofile/oprofile-for-tip	2008-10-15 22:19:41 +02:00
pci	Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D	2008-10-11 20:23:20 +02:00
power	Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D	2008-10-11 20:23:20 +02:00
vdso
video
xen	Merge branch 'linus' into x86/xen	2008-10-12 12:37:32 +02:00
Kconfig	Merge branches 'x86/xen', 'x86/build', 'x86/microcode', 'x86/mm-debug-v2', 'x86/memory-corruption-check', 'x86/early-printk', 'x86/xsave', 'x86/ptrace-v2', 'x86/quirks', 'x86/setup', 'x86/spinlocks' and 'x86/signal' into x86/core-v2	2008-10-12 15:50:02 +02:00
Kconfig.cpu	x86: make processor type select depend on CONFIG_EMBEDDED	2008-10-12 15:44:07 +02:00
Kconfig.debug
Makefile
Makefile_32.cpu