From: David S. Miller <davem@davemloft.net>
Date: Tue, 22 Jul 2014 07:44:59 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~149^2~111
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fd90bb889635fa1e7f80a3950948cc2e74c1446;p=pandora-kernel.git

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

Conflicts:
	drivers/infiniband/hw/cxgb4/device.c

The cxgb4 conflict was simply overlapping changes.

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

8fd90bb889635fa1e7f80a3950948cc2e74c1446
Reading git-diff-tree failed