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

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

Mon, 31 Aug 2015 04:45:01 +0000 (21:45 -0700)

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

Mon, 31 Aug 2015 04:45:01 +0000 (21:45 -0700)
author David S. Miller <davem@davemloft.net>
Mon, 31 Aug 2015 04:45:01 +0000 (21:45 -0700)
committer David S. Miller <davem@davemloft.net>
Mon, 31 Aug 2015 04:45:01 +0000 (21:45 -0700)
diff --cc drivers/net/bonding/bond_main.c
Simple merge
diff --cc drivers/net/ethernet/renesas/ravb_main.c
Simple merge
diff --cc drivers/net/ethernet/smsc/smsc911x.c
Simple merge
author	David S. Miller <davem@davemloft.net>
	Mon, 31 Aug 2015 04:45:01 +0000 (21:45 -0700)
committer	David S. Miller <davem@davemloft.net>
	Mon, 31 Aug 2015 04:45:01 +0000 (21:45 -0700)
		1	2
drivers/net/bonding/bond_main.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/renesas/ravb_main.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/smsc/smsc911x.c	patch \|	diff1 \|	diff2 \|	blob \| history