Merge branches 'cma', 'ipath', 'misc', 'mlx4', 'nes' and 'qib' into for-next
authorRoland Dreier <roland@purestorage.com>
Tue, 31 Jan 2012 00:18:21 +0000 (16:18 -0800)
committerRoland Dreier <roland@purestorage.com>
Tue, 31 Jan 2012 00:18:21 +0000 (16:18 -0800)

Trivial merge