Merge branches 'ipoib', 'mad', 'mlx4', 'mthca' and 'nes' into for-linus
authorRoland Dreier <rolandd@cisco.com>
Thu, 24 Sep 2009 19:43:08 +0000 (12:43 -0700)
committerRoland Dreier <rolandd@cisco.com>
Thu, 24 Sep 2009 19:43:08 +0000 (12:43 -0700)

Trivial merge