Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[linux-2.6] / drivers / ide / pci / cy82c693.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2