H. Peter Anvin b855192c08 Merge branch 'x86/urgent' into x86/pat ...

Reason: Change to is_new_memtype_allowed() in x86/urgent

Resolved semantic conflicts in:

	 arch/x86/mm/pat.c
	 arch/x86/mm/ioremap.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

2009-08-26 17:24:28 -07:00

..

boot

x86: add vmlinux.lds to targets in arch/x86/boot/compressed/Makefile

2009-08-20 16:08:58 -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

Merge branch 'x86/urgent' into x86/pat

2009-08-26 17:24:28 -07:00

kernel

Merge branch 'x86/urgent' into x86/pat

2009-08-26 17:24:28 -07:00

kvm

Merge branch 'x86/urgent' into x86/pat

2009-08-26 17:24:28 -07: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/urgent' into x86/pat

2009-08-26 17:24:28 -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

Merge branch 'x86/urgent' into x86/pat

2009-08-26 17:24:28 -07:00

vdso

gcov: enable GCOV_PROFILE_ALL for x86_64

2009-06-18 13:03:58 -07:00

video

…

xen

Merge branch 'bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen into x86/urgent

2009-08-20 12:05:24 +02:00

Kbuild

x86: standardize Kbuild rules

2009-04-16 18:09:02 +02:00

Kconfig

Merge branch 'x86/urgent' into x86/pat

2009-08-26 17:24:28 -07: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

…