Merge by hand (conflicts in sr.c)
[linux-2.6] / drivers / pci / hotplug / cpcihp_zt5550.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2