Merge branch 'master'
Jeff Garzik [Sat, 5 Nov 2005 19:38:55 +0000 (14:38 -0500)]
1  2 
MAINTAINERS
drivers/net/Kconfig

diff --cc MAINTAINERS
Simple merge
Simple merge