Merge branches 'cxgb3' and 'nes' into for-linus
authorRoland Dreier <rolandd@cisco.com>
Wed, 8 Sep 2010 21:43:28 +0000 (14:43 -0700)
committerRoland Dreier <rolandd@cisco.com>
Wed, 8 Sep 2010 21:43:28 +0000 (14:43 -0700)

Trivial merge