]> err.no Git - linux-2.6/commitdiff
/spare/repo/netdev-2.6 branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Sat, 30 Jul 2005 22:14:15 +0000 (18:14 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 30 Jul 2005 22:14:15 +0000 (18:14 -0400)
1  2 
drivers/usb/net/zd1201.c
net/Kconfig

Simple merge
diff --cc net/Kconfig
Simple merge