Ingo Molnar ca7e0c6120 Merge branch 'linus' into perf/core ... Semantic conflict: arch/x86/kernel/cpu/perf_event_intel_ds.c Merge reason: pick up latest fixes, fix the conflict Signed-off-by: Ingo Molnar <mingo@elte.hu>		2010-04-08 13:37:18 +02:00
..
boot	Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-02-28 10:43:53 -08:00
configs	tracing: Rename FTRACE_SYSCALLS for tracepoints	2009-08-26 00:17:35 +02:00
crypto	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
ia32	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
include/asm	Merge branch 'linus' into perf/core	2010-04-08 13:37:18 +02:00
kernel	Merge branch 'linus' into perf/core	2010-04-08 13:37:18 +02:00
kvm	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
lguest	lguest: move panic notifier registration to its expected place.	2009-09-23 22:26:44 +09:30
lib	perf, x86: Add INSTRUCTION_DECODER config flag	2010-03-10 13:34:12 +01:00
math-emu	…
mm	Merge branch 'master' into export-slabh	2010-04-05 11:37:28 +09:00
oprofile	perf, x86: Undo some some *_counter* -> *_event* renames	2010-04-02 19:52:02 +02:00
pci	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
power	Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip	2010-04-07 11:02:23 -07:00
tools	x86: Remove trailing spaces in messages	2010-02-07 17:47:51 +01:00
vdso	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
video	…
xen	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
Kbuild	x86: standardize Kbuild rules	2009-04-16 18:09:02 +02:00
Kconfig	Merge branch 'linus' into perf/core	2010-04-08 13:37:18 +02:00
Kconfig.cpu	x86, perf, bts, mm: Delete the never used BTS-ptrace code	2010-03-26 11:33:55 +01:00
Kconfig.debug	x86, perf, bts, mm: Delete the never used BTS-ptrace code	2010-03-26 11:33:55 +01:00
Makefile	x86-64: Allow fbdev primary video code	2010-02-16 21:22:26 -08:00
Makefile_32.cpu	Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-12-08 13:38:11 -08:00