git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dcb7731 93093d0)
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)
Merge x86/io into x86/iommu due to a small patch conflict in io.h.

1  2 
arch/x86/Kconfig patch | diff1 | diff2 | blob | history

diff --cc arch/x86/Kconfig
Simple merge
Pandora Kernel Repository