Merge branches 'ipoib', 'mlx4' and 'nes' into for-linus
authorRoland Dreier <rolandd@cisco.com>
Tue, 16 Sep 2008 18:57:52 +0000 (11:57 -0700)
committerRoland Dreier <rolandd@cisco.com>
Tue, 16 Sep 2008 18:57:52 +0000 (11:57 -0700)

Trivial merge