projects / linux-2.6-block.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 77a9939 49d8137)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sat, 29 Mar 2014 22:48:54 +0000 (18:48 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sat, 29 Mar 2014 22:48:54 +0000 (18:48 -0400)
commit64c27237a07129758e33f5f824ba5c33b7f57417
tree4c0c0a9b6d282d600f2226e1b3510096b9d789ddtree | snapshot
parent77a9939426f7a3f35f460afc9b11f1fe45955409commit | diff
parent49d8137a4039c63c834827f4bfe875e27bb9c521commit | diff
Merge git://git./linux/kernel/git/davem/net

Conflicts:
drivers/net/ethernet/marvell/mvneta.c

The mvneta.c conflict is a case of overlapping changes,
a conversion to devm_ioremap_resource() vs. a conversion
to netdev_alloc_pcpu_stats.

Signed-off-by: David S. Miller <davem@davemloft.net>
19 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/tg3.c diff1 | diff2 | blob | history
drivers/net/ethernet/marvell/mvneta.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx4/main.c diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qlge/qlge_main.c diff1 | diff2 | blob | history
drivers/net/ifb.c diff1 | diff2 | blob | history
drivers/net/veth.c diff1 | diff2 | blob | history
drivers/net/virtio_net.c diff1 | diff2 | blob | history
include/linux/netdevice.h diff1 | diff2 | blob | history
include/linux/skbuff.h diff1 | diff2 | blob | history
net/8021q/vlan_dev.c diff1 | diff2 | blob | history
net/bridge/br_device.c diff1 | diff2 | blob | history
net/bridge/br_vlan.c diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
net/core/skbuff.c diff1 | diff2 | blob | history
net/ipv4/ip_tunnel.c diff1 | diff2 | blob | history
net/ipv4/ip_tunnel_core.c diff1 | diff2 | blob | history
net/ipv4/tcp_ipv4.c diff1 | diff2 | blob | history
net/openvswitch/datapath.c diff1 | diff2 | blob | history
Linux 6.x block layer and io_uring tree(s)