Merge commit 'linus/master' into x86/urgent

author H. Peter Anvin <hpa@zytor.com>

Fri, 11 Dec 2009 18:57:42 +0000 (10:57 -0800)

committer H. Peter Anvin <hpa@zytor.com>

Fri, 11 Dec 2009 18:57:42 +0000 (10:57 -0800)
author H. Peter Anvin <hpa@zytor.com>
Fri, 11 Dec 2009 18:57:42 +0000 (10:57 -0800)
committer H. Peter Anvin <hpa@zytor.com>
Fri, 11 Dec 2009 18:57:42 +0000 (10:57 -0800)
diff --cc arch/x86/kernel/amd_iommu.c
Simple merge
diff --cc arch/x86/mm/kmmio.c
Simple merge
author	H. Peter Anvin <hpa@zytor.com>
	Fri, 11 Dec 2009 18:57:42 +0000 (10:57 -0800)
committer	H. Peter Anvin <hpa@zytor.com>
	Fri, 11 Dec 2009 18:57:42 +0000 (10:57 -0800)
		1	2
arch/x86/kernel/amd_iommu.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/kmmio.c	patch \|	diff1 \|	diff2 \|	blob \| history