Merge branches 'ehca', 'ipoib', 'iser', 'mlx4' and 'nes' into for-next
authorRoland Dreier <rolandd@cisco.com>
Tue, 13 Jan 2009 03:37:31 +0000 (19:37 -0800)
committerRoland Dreier <rolandd@cisco.com>
Tue, 13 Jan 2009 03:37:31 +0000 (19:37 -0800)

Trivial merge