Ingo Molnar ec5e61aabe Merge branch 'perf/urgent' into perf/core ... Conflicts: arch/x86/kernel/cpu/perf_event.c Merge reason: Resolve the conflict, pick up fixes Signed-off-by: Ingo Molnar <mingo@elte.hu>		2010-04-02 19:38:10 +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
crypto	tree-wide: Assorted spelling fixes	2010-02-09 11:13:56 +01:00
ia32	Add generic sys_olduname()	2010-03-12 15:52:32 -08:00
include/asm	Merge branch 'perf/urgent' into perf/core	2010-04-02 19:38:10 +02:00
kernel	Merge branch 'perf/urgent' into perf/core	2010-04-02 19:38:10 +02:00
kvm	Merge branch 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2010-03-05 13:12:34 -08:00
lguest
lib	perf, x86: Add INSTRUCTION_DECODER config flag	2010-03-10 13:34:12 +01:00
math-emu
mm	x86: Make sure free_init_pages() frees pages on page boundary	2010-03-29 18:55:33 +02:00
oprofile	perf, x86: rename macro in ARCH_PERFMON_EVENTSEL_ENABLE	2010-03-01 14:21:23 +01:00
pci	x86/PCI: truncate _CRS windows with _LEN > _MAX - _MIN + 1	2010-03-25 10:14:13 -07:00
power
tools	x86: Remove trailing spaces in messages	2010-02-07 17:47:51 +01:00
vdso
video
xen	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
Kbuild
Kconfig	Merge commit 'v2.6.34-rc2' into perf/core	2010-03-22 18:47:01 +01: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