From: David S. Miller <davem@davemloft.net>
Date: Wed, 28 Jan 2015 00:59:56 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: fixes-v4.0-rc1~150^2~118
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95f873f2fff96c592c5d863e2a39825bd8bf0500;p=pandora-kernel.git

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

Conflicts:
	arch/arm/boot/dts/imx6sx-sdb.dts
	net/sched/cls_bpf.c

Two simple sets of overlapping changes.

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

95f873f2fff96c592c5d863e2a39825bd8bf0500
Reading git-diff-tree failed