From: David S. Miller <davem@davemloft.net>
Date: Tue, 10 Mar 2015 03:38:02 +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~287
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3cef5c5b0b56f3f90b0e9ff8d3f8dc57f464cc14;p=pandora-kernel.git

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

Conflicts:
	drivers/net/ethernet/cadence/macb.c

Overlapping changes in macb driver, mostly fixes and cleanups
in 'net' overlapping with the integration of at91_ether into
macb in 'net-next'.

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

3cef5c5b0b56f3f90b0e9ff8d3f8dc57f464cc14
Reading git-diff-tree failed