Merge commit 'linus/master' into x86/urgent
commit5c6baba84e1ac6a79b266b40e17e692aab6604a1
authorH. Peter Anvin <hpa@zytor.com>
Fri, 11 Dec 2009 18:57:42 +0000 (11 10:57 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Fri, 11 Dec 2009 18:57:42 +0000 (11 10:57 -0800)
tree6ba34db1109107023d753dd9fd5c359b3b990a04
parent893f38d144a4d96d2483cd7c3801d26e1b2c23e9
parent3ef884b4c04e857c283cc77ca70ad8f638d94b0e
Merge commit 'linus/master' into x86/urgent
arch/x86/kernel/amd_iommu.c
arch/x86/mm/kmmio.c