git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 10738ee ec1f127)

author	David S. Miller <davem@davemloft.net>
	Sat, 1 Nov 2014 18:53:27 +0000 (14:53 -0400)
committer	David S. Miller <davem@davemloft.net>
	Sat, 1 Nov 2014 18:53:27 +0000 (14:53 -0400)
commit	55b42b5ca2dcf143465968697fe6c6503b05fca1
tree	91878cd53efc44ba67244d4d3897020828c87c01	tree \| snapshot
parent	10738eeaf4ab3de092586cefcc082e7d43ca0044	commit \| diff
parent	ec1f1276022e4e3ca40871810217d513e39ff250	commit \| diff

Merge git://git./linux/kernel/git/davem/net

Conflicts:
drivers/net/phy/marvell.c

Simple overlapping changes in drivers/net/phy/marvell.c

Signed-off-by: David S. Miller <davem@davemloft.net>

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/en_tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/marvell.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/r8152.c	diff1 \|	diff2 \|	blob \| history
drivers/net/xen-netback/interface.c	diff1 \|	diff2 \|	blob \| history
drivers/net/xen-netback/netback.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_forward.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/dsa/dsa.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree