Merge branch 'sky2'
authorJeff Garzik <jgarzik@pobox.com>
Sat, 12 Nov 2005 03:48:14 +0000 (22:48 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 12 Nov 2005 03:48:14 +0000 (22:48 -0500)
1  2 
drivers/net/Kconfig

Simple merge