Merge branches 'core', 'ipoib', 'iser', 'mlx4', 'ocrdma' and 'qib' into for-next
authorRoland Dreier <roland@purestorage.com>
Mon, 22 Sep 2014 17:05:40 +0000 (10:05 -0700)
committerRoland Dreier <roland@purestorage.com>
Mon, 22 Sep 2014 17:05:40 +0000 (10:05 -0700)

Trivial merge