Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

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

Thu, 5 Jul 2012 10:44:25 +0000 (03:44 -0700)

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

Thu, 5 Jul 2012 10:44:25 +0000 (03:44 -0700)
author David S. Miller <davem@davemloft.net>
Thu, 5 Jul 2012 10:44:25 +0000 (03:44 -0700)
committer David S. Miller <davem@davemloft.net>
Thu, 5 Jul 2012 10:44:25 +0000 (03:44 -0700)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/net/ethernet/intel/e1000e/netdev.c
Simple merge
diff --cc net/core/skbuff.c
Simple merge
diff --cc net/netfilter/nfnetlink.c
Simple merge
author	David S. Miller <davem@davemloft.net>
	Thu, 5 Jul 2012 10:44:25 +0000 (03:44 -0700)
committer	David S. Miller <davem@davemloft.net>
	Thu, 5 Jul 2012 10:44:25 +0000 (03:44 -0700)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/e1000e/netdev.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/netfilter/nfnetlink.c	patch \|	diff1 \|	diff2 \|	blob \| history