Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorDavid S. Miller <davem@davemloft.net>
Fri, 7 Nov 2008 09:37:16 +0000 (01:37 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 7 Nov 2008 09:37:16 +0000 (01:37 -0800)
commit167c6274c30d17c41742096d1a12c32bd3b7e366
treeb28b98e34dd2b98db6fff8459cddbc65142cd891
parent5c7f0333584128c745fbda845abbe3a32c22d467
parenta8272061fe533f6d0261b38c58c93bd0855baebe
Merge branch 'davem-next' of /linux/kernel/git/jgarzik/netdev-2.6
MAINTAINERS
drivers/net/Kconfig