Merge master.kernel.org:/home/rmk/linux-2.6-mmc
[linux-2.6] / arch / mips / pci / pci-ocelot-g.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2