Automatic merge of /spare/repo/netdev-2.6 branch dm9000
author <jgarzik@pretzel.yyz.us> <>
Sat, 4 Jun 2005 21:02:29 +0000 (17:02 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 4 Jun 2005 21:02:29 +0000 (17:02 -0400)
commit79121839aad7153907b92462759675266f1f2ac4
tree04193828c34aa1b46149840b2b24cdb703aaab5c
parentb00b2f70ddde86b0a4674b8518c78d3ad5dc68b7
parenta1365275e745bb0a173c918a52bcdfa6ce122f7e
Merge ... /spare/repo/netdev-2.6 branch dm9000
drivers/net/Kconfig
drivers/net/Makefile