Merge branch 'features' of git://farnsworth.org/dale/linux-2.6-mv643xx_eth into upstream
[safe/jmp/linux-2.6] / include / linux / atm_nicstar.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2