kernel-fxtec-pro1x/arch/x86
Ingo Molnar a1922ed661 Merge branch 'tracing/core' into tracing/hw-breakpoints
Conflicts:
	arch/Kconfig
	kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
              ring-buffer APIs.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-09-07 08:19:51 +02:00
..
boot x86: add vmlinux.lds to targets in arch/x86/boot/compressed/Makefile 2009-08-20 16:08:58 -07:00
configs tracing: Rename FTRACE_SYSCALLS for tracepoints 2009-08-26 00:17:35 +02:00
crypto crypto: aes-ni - Remove CRYPTO_TFM_REQ_MAY_SLEEP from fpu template 2009-06-18 19:44:01 +08:00
ia32
include/asm Merge branch 'tracing/core' into tracing/hw-breakpoints 2009-09-07 08:19:51 +02:00
kernel Merge branch 'tracing/core' into tracing/hw-breakpoints 2009-09-07 08:19:51 +02:00
kvm KVM: MMU: limit rmap chain length 2009-08-06 12:06:54 +03:00
lguest lguest: update commentry 2009-07-30 16:03:46 +09:30
lib x86, msr: execute on the correct CPU subset 2009-08-03 14:48:13 -07:00
math-emu
mm Merge branch 'tracing/core' into tracing/hw-breakpoints 2009-09-07 08:19:51 +02:00
oprofile x86/oprofile: rename kernel parameter for architectural perfmon to arch_perfmon 2009-07-10 05:22:50 +02:00
pci x86/pci: insert ioapic resource before assigning unassigned resources 2009-07-10 13:03:14 -07:00
power Merge branch 'tracing/core' into tracing/hw-breakpoints 2009-09-07 08:19:51 +02:00
vdso gcov: enable GCOV_PROFILE_ALL for x86_64 2009-06-18 13:03:58 -07:00
video
xen x86, xen: Initialize cx to suppress warning 2009-08-25 21:10:32 -07:00
Kbuild
Kconfig Merge branch 'tracing/core' into tracing/hw-breakpoints 2009-09-07 08:19:51 +02:00
Kconfig.cpu
Kconfig.debug
Makefile
Makefile_32.cpu