From: David S. Miller <davem@davemloft.net>
Date: Tue, 23 Sep 2014 16:09:27 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: fixes-against-v3.18-rc2~81^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f6d80358dc9bbbeb56cb43384fa11fd645d9289;p=pandora-kernel.git

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

Conflicts:
	arch/mips/net/bpf_jit.c
	drivers/net/can/flexcan.c

Both the flexcan and MIPS bpf_jit conflicts were cases of simple
overlapping changes.

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

1f6d80358dc9bbbeb56cb43384fa11fd645d9289
Reading git-diff-tree failed