Ingo Molnar eadb8a091b Merge branch 'linus' into tracing/hw-breakpoints ... Conflicts: arch/x86/Kconfig arch/x86/kernel/traps.c arch/x86/power/cpu.c arch/x86/power/cpu_32.c kernel/Makefile Semantic conflict: arch/x86/kernel/hw_breakpoint.c Merge reason: Resolve the conflicts, move from put_cpu_no_sched() to put_cpu() in arch/x86/kernel/hw_breakpoint.c. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-06-17 12:56:49 +02:00
..
boot	Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-06-10 16:14:41 -07:00
configs	Merge branch 'x86-kbuild-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-06-10 15:30:41 -07:00
crypto	crypto: aes-ni - Add support for more modes	2009-06-02 14:04:16 +10:00
ia32	Merge branch 'core/signal' into perfcounters/core	2009-04-30 21:16:49 +02:00
include/asm	Merge branch 'linus' into tracing/hw-breakpoints	2009-06-17 12:56:49 +02:00
kernel	Merge branch 'linus' into tracing/hw-breakpoints	2009-06-17 12:56:49 +02:00
kvm	page allocator: do not check NUMA node ID when the caller knows the node is valid	2009-06-16 19:47:32 -07:00
lguest	lguest: PAE support	2009-06-12 22:27:08 +09:30
lib	x86: MSR: add methods for writing of an MSR on several CPUs	2009-06-10 12:18:43 +02: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 'linus' into tracing/hw-breakpoints	2009-06-17 12:56:49 +02:00
oprofile	Merge branch 'linus' into perfcounters/core	2009-06-11 17:55:42 +02:00
pci	Merge branch 'irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-06-10 15:25:41 -07:00
power	Merge branch 'linus' into tracing/hw-breakpoints	2009-06-17 12:56:49 +02:00
vdso	Merge branch 'linus' into perfcounters/core	2009-06-11 17:55:42 +02:00
video
xen	Merge branch 'x86-xen-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-06-10 16:16:27 -07:00
Kbuild	x86: standardize Kbuild rules	2009-04-16 18:09:02 +02:00
Kconfig	Merge branch 'linus' into tracing/hw-breakpoints	2009-06-17 12:56:49 +02:00
Kconfig.cpu	Revert "x86, bts: reenable ptrace branch trace support"	2009-06-11 00:32:00 +02:00
Kconfig.debug	kmemcheck: make kconfig accessible for other architectures	2009-06-15 15:49:17 +02:00
Makefile	kmemcheck: add the kmemcheck core	2009-06-13 15:37:30 +02:00
Makefile_32.cpu