Merge branch 'core/iommu'
commit4dc31b6b9052679eae784bfe1ea53d420c2fc3ce
authorIngo Molnar <mingo@elte.hu>
Thu, 7 Jul 2011 11:06:42 +0000 (7 13:06 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 7 Jul 2011 11:06:42 +0000 (7 13:06 +0200)
tree2dd167f28535d4b0925c39190e8810f4890d759f
parent0a59e606042b67634616af863196773dc5017d3d
parentb395fb36d59e17b9335805c10fa30fc51c8a94c6
Merge branch 'core/iommu'
arch/x86/Kconfig
arch/x86/kernel/Makefile