From: David S. Miller <davem@davemloft.net>
Date: Thu, 15 Jan 2015 05:53:17 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: fixes-v4.0-rc1~150^2~214
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f3558bb512e0762d5a4573a4aaf038d7a616e92;p=pandora-kernel.git

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>
---

3f3558bb512e0762d5a4573a4aaf038d7a616e92
Reading git-diff-tree failed