Merge branches 'misc', 'mlx4' and 'nes' into for-next
authorRoland Dreier <rolandd@cisco.com>
Thu, 2 Dec 2010 00:33:47 +0000 (16:33 -0800)
committerRoland Dreier <rolandd@cisco.com>
Thu, 2 Dec 2010 00:33:47 +0000 (16:33 -0800)

Trivial merge