1
0
Fork 0
alistair23-linux/arch/x86
Ingo Molnar be750231ce Merge branch 'perfcounters/urgent' into perfcounters/core
Conflicts:
	kernel/perf_counter.c

Merge reason: update to latest upstream (-rc6) and resolve
              the conflict with urgent fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-08-15 12:06:12 +02:00
..
boot x86: fix usage of bios intcall() 2009-07-04 12:56:32 -07:00
configs Merge branch 'x86-kbuild-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-06-10 15:30:41 -07:00
crypto crypto: aes-ni - Remove CRYPTO_TFM_REQ_MAY_SLEEP from fpu template 2009-06-18 19:44:01 +08:00
ia32 Merge branch 'core/signal' into perfcounters/core 2009-04-30 21:16:49 +02:00
include/asm x86, perf_counter, bts: Add BTS support to perfcounters 2009-08-09 13:04:14 +02:00
kernel Merge branch 'perfcounters/urgent' into perfcounters/core 2009-08-15 12:06:12 +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 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-08-04 15:28:59 -07: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 x86: Fix resume from suspend when CONFIG_CC_STACKPROTECTOR 2009-07-08 13:20:13 +02:00
vdso gcov: enable GCOV_PROFILE_ALL for x86_64 2009-06-18 13:03:58 -07:00
video
xen Merge branch 'x86-xen-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-06-10 16:16:27 -07:00
Kbuild x86: standardize Kbuild rules 2009-04-16 18:09:02 +02:00
Kconfig perf_counter, x86: Fix/improve apic fallback 2009-08-12 14:12:49 +02:00
Kconfig.cpu Revert "x86, bts: reenable ptrace branch trace support" 2009-06-11 00:32:00 +02:00
Kconfig.debug kmemcheck: make kconfig accessible for other architectures 2009-06-15 15:49:17 +02:00
Makefile kmemcheck: add the kmemcheck core 2009-06-13 15:37:30 +02:00
Makefile_32.cpu