Merge branch 'linus' into core/iommu
authorIngo Molnar <mingo@elte.hu>
Sat, 28 Mar 2009 22:05:50 +0000 (23:05 +0100)
committerIngo Molnar <mingo@elte.hu>
Sat, 28 Mar 2009 22:05:50 +0000 (23:05 +0100)
Conflicts:
arch/x86/Kconfig


Trivial merge