From: David S. Miller <davem@davemloft.net>
Date: Wed, 24 Jun 2015 09:58:51 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: omap-for-v4.2/fixes-rc1^2~134^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a07bd6fead4f00f67b1bf5f551e686661c4f52c;p=pandora-kernel.git

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

Conflicts:
	drivers/net/ethernet/mellanox/mlx4/main.c
	net/packet/af_packet.c

Both conflicts were cases of simple overlapping changes.

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

3a07bd6fead4f00f67b1bf5f551e686661c4f52c
Reading git-diff-tree failed