Merge branches 'cxgb3', 'cxgb4', 'ehca', 'ipath', 'misc', 'nes', 'qib' and 'srp'...
authorRoland Dreier <rolandd@cisco.com>
Thu, 5 Aug 2010 21:27:14 +0000 (14:27 -0700)
committerRoland Dreier <rolandd@cisco.com>
Thu, 5 Aug 2010 21:27:14 +0000 (14:27 -0700)

Trivial merge