git.kernel.dk Git - linux-2.6-block.git/commit

projects / linux-2.6-block.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: bd695a5 26bcd8b)

author	David S. Miller <davem@davemloft.net>
	Wed, 30 Jul 2014 20:25:49 +0000 (13:25 -0700)
committer	David S. Miller <davem@davemloft.net>
	Wed, 30 Jul 2014 20:25:49 +0000 (13:25 -0700)
commit	f139c74a8df071217dcd63f3ef06ae7be7071c4d
tree	5711f695577a18a06dbcd0101956e97b388ffa1a	tree \| snapshot
parent	bd695a5f0ccf7b38982c426d86055ff3591c9b5b	commit \| diff
parent	26bcd8b72563b4c54892c4c2a409f6656fb8ae8b	commit \| diff

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

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

13 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/can/c_can/c_can_platform.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/xgbe/xgbe-main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/genet/bcmgenet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/hyperv/netvsc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy_device.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/r8152.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan.c	diff1 \|	diff2 \|	blob \| history
include/net/ip.h	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_output.c	diff1 \|	diff2 \|	blob \| history

Linux 6.x block layer and io_uring tree(s)