kernel-fxtec-pro1x/arch/x86
Ingo Molnar a3eeeefbf1 Merge branch 'x86/tsc' into tracing/core
Merge it to resolve this incidental conflict between the BTS fixes/cleanups
and changes in x86/tsc:

Conflicts:
	arch/x86/kernel/cpu/intel.c
2008-12-25 12:48:18 +01:00
..
boot x86: use limited register constraint for setnz 2008-11-25 15:38:03 +01:00
configs x86: remove irqbalance in kernel for 32 bit 2008-10-16 16:52:52 +02:00
crypto
ia32 compat: generic compat get/settimeofday 2008-10-16 11:21:33 -07:00
include/asm Merge branch 'x86/tsc' into tracing/core 2008-12-25 12:48:18 +01:00
kernel Merge branch 'x86/tsc' into tracing/core 2008-12-25 12:48:18 +01:00
kvm KVM: MMU: avoid creation of unreachable pages in the shadow 2008-11-26 12:34:27 +02:00
lguest lguest: fix irq vectors. 2008-10-31 11:24:28 +11:00
lib
mach-default
mach-generic x86: make 32bit support per_cpu vector 2008-10-16 16:52:53 +02:00
mach-rdc321x
mach-voyager x86, voyager: fix smp generic helper voyager breakage 2008-11-11 12:08:53 +01:00
math-emu
mm Merge commit 'v2.6.28-rc7'; branch 'x86/dumpstack' into tracing/ftrace 2008-12-03 08:55:34 +01:00
oprofile x86/oprofile: fix Intel cpu family 6 detection 2008-12-03 17:17:17 +01:00
pci x86: fixup config space size of CPU functions for AMD family 11h 2008-11-26 03:53:27 +01:00
power x86, hibernate: fix breakage on x86_32 with CONFIG_NUMA set 2008-11-12 23:28:51 +01:00
vdso trace: rename unlikely profiler to branch profiler 2008-11-12 22:27:58 +01:00
video
xen Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2008-11-30 13:01:04 -08:00
Kconfig tracing/function-graph-tracer: support for x86-64 2008-12-02 09:47:48 +01:00
Kconfig.cpu x86, bts, ftrace: a BTS ftrace plug-in prototype 2008-11-25 17:31:13 +01:00
Kconfig.debug trace: add the MMIO-tracer to the tracer menu, cleanup 2008-10-27 14:07:26 +01:00
Makefile x86, um: ... and asm-x86 move 2008-10-22 22:55:20 -07:00
Makefile_32.cpu