From: David S. Miller <davem@davemloft.net>
Date: Sat, 1 Nov 2014 18:53:27 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: omap-for-v3.19/fixes-rc1~125^2~297
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55b42b5ca2dcf143465968697fe6c6503b05fca1;p=pandora-kernel.git

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

Conflicts:
	drivers/net/phy/marvell.c

Simple overlapping changes in drivers/net/phy/marvell.c

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

55b42b5ca2dcf143465968697fe6c6503b05fca1
Reading git-diff-tree failed