Merge with linus
[powerpc.git] / arch / mips / pci / ops-tx4927.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2