From: David S. Miller <davem@davemloft.net>
Date: Thu, 23 Jul 2015 07:41:16 +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~317
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5e40ee287db61a79af1746954ee03ebbf1ff8a3;p=pandora-kernel.git

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

Conflicts:
	net/bridge/br_mdb.c

br_mdb.c conflict was a function call being removed to fix a bug in
'net' but whose signature was changed in 'net-next'.

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

c5e40ee287db61a79af1746954ee03ebbf1ff8a3
Reading git-diff-tree failed