Merge branch 'linus' into core/rodata
[pandora-kernel.git] / include / asm-s390 / pci.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2