Auto merge with /home/aegl/GIT/linus
[powerpc.git] / arch / arm / mach-iop3xx / iq31244-pci.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2