Ingo Molnar 9676e73a9e Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core ... Conflicts: kernel/trace/ftrace.c [ We conflicted here because we backported a few fixes to tracing/urgent - which has different internal APIs. ]		2008-11-19 10:04:25 +01:00
..
boot	.gitignore updates	2008-10-30 11:38:45 -07:00
configs	x86: remove irqbalance in kernel for 32 bit	2008-10-16 16:52:52 +02:00
crypto	crypto: crc32c - Use Intel CRC32 instruction	2008-08-29 15:49:50 +10:00
ia32	compat: generic compat get/settimeofday	2008-10-16 11:21:33 -07:00
include/asm	Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core	2008-11-19 10:04:25 +01:00
kernel	Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core	2008-11-19 10:04:25 +01:00
kvm	KVM: Fix pit memory leak if unable to allocate irq source id	2008-11-11 21:01:51 +02:00
lguest	lguest: fix irq vectors.	2008-10-31 11:24:28 +11:00
lib	Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D	2008-10-11 20:23:20 +02:00
mach-default	Merge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core	2008-08-14 14:58:22 +02:00
mach-generic	x86: make 32bit support per_cpu vector	2008-10-16 16:52:53 +02:00
mach-rdc321x	removed unused #include <linux/version.h>'s	2008-08-23 12:14:12 -07:00
mach-voyager	x86, voyager: fix smp_intr_init() compile breakage	2008-11-03 10:52:21 +01:00
math-emu	x86: coding style fixes to arch/x86/math-emu/reg_constant	2008-06-18 15:00:13 +02:00
mm	Merge branch 'tracing/urgent' into tracing/ftrace	2008-11-11 09:40:18 +01:00
oprofile	oprofile: Fix p6 counter overflow check	2008-11-07 17:34:41 +01:00
pci	x86/PCI: irq and pci_ids patch for Intel Ibex Peak DeviceIDs	2008-10-20 10:53:48 -07:00
power	Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D	2008-10-11 20:23:20 +02:00
vdso	trace: rename unlikely profiler to branch profiler	2008-11-12 22:27:58 +01:00
video	x86: video/fbdev.c: add MODULE_LICENSE	2008-05-04 20:04:46 +02:00
xen	Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-11-07 09:17:59 -08:00
Kconfig	Merge branch 'tracing/function-return-tracer' into tracing/fastboot	2008-11-12 10:17:09 +01:00
Kconfig.cpu	x86, bts: improve help text for BTS config	2008-10-28 16:39:37 +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	x86: merge winchip-2 and winchip-2a cpu choices	2008-10-13 10:22:48 +02:00