Merge branch 'master' into upstream
[powerpc.git] / include / asm-i386 / mach-default / pci-functions.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2