Merge branches 'misc' and 'mlx4' into for-next
authorRoland Dreier <rolandd@cisco.com>
Wed, 6 Jan 2010 21:16:47 +0000 (13:16 -0800)
committerRoland Dreier <rolandd@cisco.com>
Wed, 6 Jan 2010 21:16:47 +0000 (13:16 -0800)

Trivial merge