Ingo Molnar 96200591a3 Merge branch 'tracing/hw-breakpoints' into perf/core ... Conflicts: arch/x86/kernel/kprobes.c kernel/trace/Makefile Merge reason: hw-breakpoints perf integration is looking good in testing and in reviews, plus conflicts are mounting up - so merge & resolve. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-11-21 14:07:23 +01:00
..
boot	x86: Document linker script ASSERT() quirk	2009-10-16 07:18:46 +02:00
configs	tracing: Rename FTRACE_SYSCALLS for tracepoints	2009-08-26 00:17:35 +02:00
crypto	crypto: aesni-intel - Fix irq_fpu_usable usage	2009-10-20 16:20:47 +09:00
ia32	x86-64: Fix register leak in 32-bit syscall audting	2009-10-26 16:23:26 +01:00
include/asm	Merge branch 'tracing/hw-breakpoints' into perf/core	2009-11-21 14:07:23 +01:00
kernel	Merge branch 'tracing/hw-breakpoints' into perf/core	2009-11-21 14:07:23 +01:00
kvm	Merge branch 'tracing/hw-breakpoints' into perf/core	2009-11-21 14:07:23 +01:00
lguest	lguest: move panic notifier registration to its expected place.	2009-09-23 22:26:44 +09:30
lib	x86: Gitignore: arch/x86/lib/inat-tables.c	2009-11-04 13:11:28 +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/hw-breakpoints' into perf/core	2009-11-21 14:07:23 +01:00
oprofile	perf: Do the big rename: Performance Counters -> Performance Events	2009-09-21 14:28:04 +02:00
pci	const: mark struct vm_struct_operations	2009-09-27 11:39:25 -07:00
power	hw-breakpoints: Rewrite the hw-breakpoints layer on top of perf events	2009-11-08 15:34:42 +01:00
tools	x86: Instruction decoder test should generate build warning	2009-11-19 21:40:13 +01:00
vdso	kbuild: rename ld-option to cc-ldoption	2009-09-20 12:27:42 +02:00
video	…
xen	xen: mask extended topology info in cpuid	2009-11-03 11:09:12 -08:00
Kbuild	x86: standardize Kbuild rules	2009-04-16 18:09:02 +02:00
Kconfig	Merge branch 'tracing/hw-breakpoints' into perf/core	2009-11-21 14:07:23 +01:00
Kconfig.cpu	x86: Side-step lguest problem by only building cmpxchg8b_emu for pre-Pentium	2009-10-26 12:33:02 +01:00
Kconfig.debug	x86: X86 instruction decoder build-time selftest	2009-08-27 00:35:56 +02:00
Makefile	Merge branch 'perf/core' into perf/probes	2009-11-17 10:17:47 +01:00
Makefile_32.cpu	x86: add specific support for Intel Atom architecture	2009-08-23 11:20:02 +02:00