From: David S. Miller <davem@davemloft.net>
Date: Tue, 14 Apr 2015 19:44:14 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: omap-for-v4.1/fixes-rc1~141^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87ffabb1f055e14e7d171c6599539a154d647904;p=pandora-kernel.git

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

The dwmac-socfpga.c conflict was a case of a bug fix overlapping
changes in net-next to handle an error pointer differently.

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

87ffabb1f055e14e7d171c6599539a154d647904
Reading git-diff-tree failed