tree 1e2b43d410093e949209ca33614f5cdfdd16e80e
parent 9a6b4b392de4569e83ecfd6f382f3369f250b52f
parent a6391a924cf5a16761ccd6b45094a7d5b9aeebac
author David S. Miller <davem@davemloft.net> 1421301197 -0500
committer David S. Miller <davem@davemloft.net> 1421301197 -0500

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>