Merge branches 'cxgb3', 'misc' and 'mlx4' into for-next
Roland Dreier [Wed, 7 Oct 2009 23:03:32 +0000 (16:03 -0700)]

Trivial merge