Merge branch 'master'
commit596c96ba06e5d56e72451e02f93f4e15e17458df
authorJeff Garzik <jgarzik@pobox.com>
Fri, 28 Oct 2005 22:48:57 +0000 (28 18:48 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 28 Oct 2005 22:48:57 +0000 (28 18:48 -0400)
tree78bc640acacb8faeb621c51296e99dbb0533a147
parentad18b0ea089928367185e13d11424aea91d4b41f
parent20731945ae743034353a88c307920d1f16cf8ac8
Merge branch 'master'
MAINTAINERS
drivers/net/Kconfig
drivers/net/smc91x.c