Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
[linux-2.6] / drivers / atm / nicstarmac.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2