Automatic merge of /spare/repo/linux-2.6/.git branch HEAD
[linux-2.6] / drivers / net / tulip / pnic.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2