Automatic merge of /spare/repo/netdev-2.6 branch skge
author <jgarzik@pretzel.yyz.us> <>
Sat, 4 Jun 2005 21:54:39 +0000 (17:54 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 4 Jun 2005 21:54:39 +0000 (17:54 -0400)
commit2089a0d38bc9c2cdd084207ebf7082b18cf4bf58
treeecdbd64b6587bab6f5c4dac03a0fd10f70cf3026
parent03d661d3d7dd2c20330d775c13157419049f1617
parent0b2d7fea1c3893c3790e0b89c310ec1321f1b8c0
Merge ... /spare/repo/netdev-2.6 branch skge
drivers/net/Kconfig
drivers/net/Makefile