Merge branches 'amso1100', 'cma', 'cxgb4', 'misc', 'mlx4' and 'qib' into for-next
authorRoland Dreier <roland@purestorage.com>
Sun, 30 Jan 2011 04:45:04 +0000 (20:45 -0800)
committerRoland Dreier <roland@purestorage.com>
Sun, 30 Jan 2011 04:45:04 +0000 (20:45 -0800)

Trivial merge