Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
[linux-2.6] / drivers / net / mace.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2