From: Roland Dreier <roland@purestorage.com>
Date: Mon, 21 May 2012 16:00:47 +0000 (-0700)
Subject: Merge branches 'core', 'cxgb4', 'ipath', 'iser', 'lockdep', 'mlx4', 'nes', 'ocrdma... 
X-Git-Tag: v3.5-rc1~171^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=cc169165c82e14ea43e313f937a0a475ca97e588;p=linux.git

Merge branches 'core', 'cxgb4', 'ipath', 'iser', 'lockdep', 'mlx4', 'nes', 'ocrdma', 'qib' and 'raw-qp' into for-linus
---

cc169165c82e14ea43e313f937a0a475ca97e588