Merge branches 'cxgb4', 'misc', 'mlx4', 'nes' and 'qib' into for-next
authorRoland Dreier <rolandd@cisco.com>
Tue, 25 May 2010 16:54:03 +0000 (09:54 -0700)
committerRoland Dreier <rolandd@cisco.com>
Tue, 25 May 2010 16:54:03 +0000 (09:54 -0700)
commitacdc30b56abc0db7d409a13e9b6c72ea23b6f90d
treef2f8b7e409128b9d0e1335c60c73f4b2fec70d94
parent30a6a62fc35208924ffa8a472b0af4552441cbff
parent1693395511a2840f67dd3184212a072ac7f07524
parentc050def076bfbc4513ee961c77fde6ba3d401158
parentb17e0969dc184c66ed8934e130344621829484a3
parentf6d60848baf9f4015c76c665791875ed623cd5b7
Merge branches 'cxgb4', 'misc', 'mlx4', 'nes' and 'qib' into for-next
drivers/infiniband/hw/cxgb4/provider.c