From: David S. Miller <davem@davemloft.net>
Date: Tue, 14 Jul 2015 00:28:09 +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~364
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=638d3c63811e31b2745f7fdd568b38c8abcffe03;p=pandora-kernel.git

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

Conflicts:
	net/bridge/br_mdb.c

Minor conflict in br_mdb.c, in 'net' we added a memset of the
on-stack 'ip' variable whereas in 'net-next' we assign a new
member 'vid'.

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

638d3c63811e31b2745f7fdd568b38c8abcffe03
Reading git-diff-tree failed