From: David S. Miller <davem@davemloft.net>
Date: Sat, 15 Mar 2014 02:31:55 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.15-rc1~113^2~148
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85dcce7a73f1cc59f7a96fe52713b1630f4ca272;p=pandora-kernel.git

Merge git://git./linux/kernel/git/davem/net

Conflicts:
	drivers/net/usb/r8152.c
	drivers/net/xen-netback/netback.c

Both the r8152 and netback conflicts were simple overlapping
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

85dcce7a73f1cc59f7a96fe52713b1630f4ca272
Reading git-diff-tree failed