From: David S. Miller <davem@davemloft.net>
Date: Thu, 13 Aug 2015 23:23:11 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: omap-for-v4.3/fixes-rc1~110^2~178
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=182ad468e70fc7e8ff2e5d64344c690beaa00ddd;p=pandora-kernel.git

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

Conflicts:
	drivers/net/ethernet/cavium/Kconfig

The cavium conflict was overlapping dependency
changes.

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

182ad468e70fc7e8ff2e5d64344c690beaa00ddd
Reading git-diff-tree failed