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)
1  2 
drivers/net/Kconfig
drivers/net/Makefile

Simple merge
Simple merge