Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

author David S. Miller <davem@davemloft.net>

Fri, 7 Nov 2008 09:37:16 +0000 (01:37 -0800)

committer David S. Miller <davem@davemloft.net>

Fri, 7 Nov 2008 09:37:16 +0000 (01:37 -0800)
author David S. Miller <davem@davemloft.net>
Fri, 7 Nov 2008 09:37:16 +0000 (01:37 -0800)
committer David S. Miller <davem@davemloft.net>
Fri, 7 Nov 2008 09:37:16 +0000 (01:37 -0800)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/net/Kconfig
Simple merge
author	David S. Miller <davem@davemloft.net>
	Fri, 7 Nov 2008 09:37:16 +0000 (01:37 -0800)
committer	David S. Miller <davem@davemloft.net>
	Fri, 7 Nov 2008 09:37:16 +0000 (01:37 -0800)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history