Merge ../to-linus
[linux-2.6] / drivers / ide / pci / sl82c105.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2