Merge commit '63cc8c75156462d4b42cbdd76c293b7eee7ddbfe':
[linux-2.6] / drivers / net / mace.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2