Merge commit 'linus/master' into x86/urgent
H. Peter Anvin [Fri, 11 Dec 2009 18:57:42 +0000 (10:57 -0800)]
1  2 
arch/x86/kernel/amd_iommu.c
arch/x86/mm/kmmio.c

Simple merge
Simple merge