From: Roland Dreier <roland@purestorage.com>
Date: Thu, 23 Jan 2014 07:24:21 +0000 (-0800)
Subject: Merge branch 'ip-roce' into for-next
X-Git-Tag: v3.14-rc1~103^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb1b5034e4987b158179a62732fb6dfb8f7ec88e;p=pandora-kernel.git

Merge branch 'ip-roce' into for-next

Conflicts:
	drivers/infiniband/hw/mlx4/main.c
---

fb1b5034e4987b158179a62732fb6dfb8f7ec88e
Reading git-diff-tree failed