From: David S. Miller <davem@davemloft.net>
Date: Wed, 10 Dec 2014 20:48:20 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: omap-for-v3.19/fixes-rc1~125^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22f10923dd39141785273e423b9acf347297e15f;p=pandora-kernel.git

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

Conflicts:
	drivers/net/ethernet/amd/xgbe/xgbe-desc.c
	drivers/net/ethernet/renesas/sh_eth.c

Overlapping changes in both conflict cases.

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

22f10923dd39141785273e423b9acf347297e15f
Reading git-diff-tree failed