From: Roland Dreier <roland@purestorage.com>
Date: Wed, 6 Jun 2012 17:08:11 +0000 (-0700)
Subject: Merge branches 'cxgb4', 'mlx4' and 'ocrdma' into for-linus
X-Git-Tag: v3.5-rc2~20^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20952cdd8e79945245be29f8f5ecac5abc99b4ae;p=pandora-kernel.git

Merge branches 'cxgb4', 'mlx4' and 'ocrdma' into for-linus
---

20952cdd8e79945245be29f8f5ecac5abc99b4ae
Reading git-diff-tree failed