Merge branch 'x86/io' into x86/iommu

Merge x86/io into x86/iommu due to a small patch conflict in io.h.
This commit is contained in:
Ingo Molnar 2008-12-03 08:25:56 +01:00
commit 6083aa485c
6 changed files with 42 additions and 14 deletions