Merge branch 'mlx4' into for-next
authorRoland Dreier <rolandd@cisco.com>
Tue, 2 Mar 2010 07:51:56 +0000 (23:51 -0800)
committerRoland Dreier <rolandd@cisco.com>
Tue, 2 Mar 2010 07:51:56 +0000 (23:51 -0800)

Trivial merge