Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Linus Torvalds [Mon, 16 Jan 2006 00:43:29 +0000 (16:43 -0800)]
1  2 
MAINTAINERS
drivers/net/Kconfig

diff --cc MAINTAINERS
Simple merge
Simple merge