linux/arch/x86
Frederic Weisbecker 0f8f86c7bd Merge commit 'perf/core' into perf/hw-breakpoint
Conflicts:
	kernel/Makefile
	kernel/trace/Makefile
	kernel/trace/trace.h
	samples/Makefile

Merge reason: We need to be uptodate with the perf events development
branch because we plan to rewrite the breakpoints API on top of
perf events.
2009-10-18 01:12:33 +02:00
..
boot Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-09-26 10:13:35 -07:00
configs tracing: Rename FTRACE_SYSCALLS for tracepoints 2009-08-26 00:17:35 +02:00
crypto Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-09-14 07:57:32 -07:00
ia32 x86: Don't leak 64-bit kernel register values to 32-bit processes 2009-10-01 11:24:26 +02:00
include/asm Merge commit 'perf/core' into perf/hw-breakpoint 2009-10-18 01:12:33 +02:00
kernel Merge commit 'perf/core' into perf/hw-breakpoint 2009-10-18 01:12:33 +02:00
kvm Merge commit 'perf/core' into perf/hw-breakpoint 2009-10-18 01:12:33 +02:00
lguest lguest: move panic notifier registration to its expected place. 2009-09-23 22:26:44 +09:30
lib x86: Don't generate cmpxchg8b_emu if CONFIG_X86_CMPXCHG64=y 2009-10-01 08:42:24 +02:00
math-emu
mm Merge commit 'perf/core' into perf/hw-breakpoint 2009-10-18 01:12:33 +02: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 Merge commit 'perf/core' into perf/hw-breakpoint 2009-10-18 01:12:33 +02:00
vdso kbuild: rename ld-option to cc-ldoption 2009-09-20 12:27:42 +02:00
video
xen const: constify remaining file_operations 2009-10-01 16:11:11 -07:00
Kbuild x86: standardize Kbuild rules 2009-04-16 18:09:02 +02:00
Kconfig Merge commit 'perf/core' into perf/hw-breakpoint 2009-10-18 01:12:33 +02:00
Kconfig.cpu x86: Optimize cmpxchg64() at build-time some more 2009-10-01 08:01:08 +02:00
Kconfig.debug kmemcheck: make kconfig accessible for other architectures 2009-06-15 15:49:17 +02:00
Makefile kbuild: use INSTALLKERNEL to select customized installkernel script 2009-09-20 12:18:14 +02:00
Makefile_32.cpu x86: add specific support for Intel Atom architecture 2009-08-23 11:20:02 +02:00