Merge branches 'cma', 'ipoib', 'iser', 'mlx4' and 'nes' into for-next
authorRoland Dreier <roland@purestorage.com>
Fri, 5 Oct 2012 02:12:22 +0000 (19:12 -0700)
committerRoland Dreier <roland@purestorage.com>
Fri, 5 Oct 2012 02:12:22 +0000 (19:12 -0700)

Trivial merge