Merge branch 'linus' into pci-for-jesse
[linux-2.6] / arch / alpha / kernel / ns87312.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2