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)
commit3f3558bb512e0762d5a4573a4aaf038d7a616e92
tree1e2b43d410093e949209ca33614f5cdfdd16e80e
parent9a6b4b392de4569e83ecfd6f382f3369f250b52f
parenta6391a924cf5a16761ccd6b45094a7d5b9aeebac
Merge git://git./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