From: David S. Miller <davem@davemloft.net>
Date: Sat, 1 Aug 2015 06:52:20 +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~242
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5510b3c2a173921374ec847848fb20b98e1c698a;p=pandora-kernel.git

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

Conflicts:
	arch/s390/net/bpf_jit_comp.c
	drivers/net/ethernet/ti/netcp_ethss.c
	net/bridge/br_multicast.c
	net/ipv4/ip_fragment.c

All four conflicts were cases of simple overlapping
changes.

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

5510b3c2a173921374ec847848fb20b98e1c698a
Reading git-diff-tree failed