Merge branches 'ehca', 'misc', 'mlx4', 'mthca' and 'nes' into for-linus
authorRoland Dreier <rolandd@cisco.com>
Tue, 23 Jun 2009 17:38:47 +0000 (10:38 -0700)
committerRoland Dreier <rolandd@cisco.com>
Tue, 23 Jun 2009 17:38:47 +0000 (10:38 -0700)

Trivial merge