Merge branches 'cxgb4' and 'mlx4' into for-next
authorRoland Dreier <roland@purestorage.com>
Tue, 23 Oct 2012 16:03:49 +0000 (09:03 -0700)
committerRoland Dreier <roland@purestorage.com>
Tue, 23 Oct 2012 16:03:49 +0000 (09:03 -0700)

Trivial merge