From: David S. Miller <davem@davemloft.net>
Date: Fri, 2 Oct 2015 14:21:25 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f6d3125fa3c2f55ddf7cf69365c41089de6cfae6;p=openwrt%2Fstaging%2Fblogic.git

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

Conflicts:
	net/dsa/slave.c

net/dsa/slave.c simply had overlapping changes.

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

f6d3125fa3c2f55ddf7cf69365c41089de6cfae6