Merge branches 'core', 'cxgb4', 'iser', 'mlx5' and 'ocrdma' into for-next
authorRoland Dreier <roland@purestorage.com>
Tue, 14 Oct 2014 21:09:12 +0000 (14:09 -0700)
committerRoland Dreier <roland@purestorage.com>
Tue, 14 Oct 2014 21:09:12 +0000 (14:09 -0700)

Trivial merge