Merge ../scsi-misc-2.6
[sfrench/cifs-2.6.git] / arch / alpha / kernel / ns87312.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2