tree 152bfa5165292a8e4f06d536b6d222a68480e573
parent a2aeb02a8e6a9fef397c344245a54eeae67341f6
parent 98f75b8291a89ba6bf73e322ee467ce0bfeb91c1
author David S. Miller <davem@davemloft.net> 1411488567 -0400
committer David S. Miller <davem@davemloft.net> 1411488567 -0400

Merge git://git.kernel.org/pub/scm/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>