Merge branches 'core', 'cxgb4', 'iser', 'mlx4', 'mlx5', 'ocrdma', 'odp', 'qib' and...
authorRoland Dreier <roland@purestorage.com>
Fri, 20 Feb 2015 17:04:40 +0000 (09:04 -0800)
committerRoland Dreier <roland@purestorage.com>
Fri, 20 Feb 2015 17:04:40 +0000 (09:04 -0800)

Trivial merge