Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 23 Dec 2009 22:09:17 +0000 (14:09 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 23 Dec 2009 22:09:17 +0000 (14:09 -0800)
1  2 
drivers/net/Kconfig

Simple merge