Merge branches 'misc', 'mlx4', 'mthca', 'nes' and 'srp' into for-next
authorRoland Dreier <rolandd@cisco.com>
Mon, 17 Jan 2011 05:22:41 +0000 (21:22 -0800)
committerRoland Dreier <rolandd@cisco.com>
Mon, 17 Jan 2011 05:22:41 +0000 (21:22 -0800)

Trivial merge