]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 15 Jan 2015 05:53:17 +0000 (00:53 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 15 Jan 2015 05:53:17 +0000 (00:53 -0500)
commitb4ab0c08a64a5070a8825351b3b166107c1dbe33
tree1e2b43d410093e949209ca33614f5cdfdd16e80e
parentf049e18ed8d496b7b5374fbe0a4e5908435aab1a
parent119f1abd23b345a163b2e75c0304c51cb6293c00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
drivers/net/xen-netfront.c

Minor overlapping changes in xen-netfront.c, mostly to do
with some buffer management changes alongside the split
of stats into TX and RX.

Signed-off-by: David S. Miller <davem@davemloft.net>
13 files changed:
MAINTAINERS
drivers/net/ethernet/broadcom/tg3.c
drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c
drivers/net/ethernet/freescale/fec.h
drivers/net/ethernet/freescale/fec_main.c
drivers/net/ethernet/intel/i40e/i40e_txrx.c
drivers/net/team/team.c
drivers/net/xen-netfront.c
drivers/vhost/net.c
include/linux/netdevice.h
net/openvswitch/datapath.c
net/packet/af_packet.c