Merge branch 'x86/io' into x86/iommu
authorIngo Molnar <mingo@elte.hu>
Wed, 3 Dec 2008 07:25:56 +0000 (08:25 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 3 Dec 2008 07:25:59 +0000 (08:25 +0100)
commit6083aa485c86933ee444dc2242270d37ea4664cb
treee2b7b9588bbf18a62bf08fcf3fda812de25cda4d
parentdcb7731a185efbf3d800618d874af99895df5afb
parent93093d099e5dd0c258fd530c12668e828c20df41
Merge branch 'x86/io' into x86/iommu

Merge x86/io into x86/iommu due to a small patch conflict in io.h.
arch/x86/Kconfig