aboutsummaryrefslogtreecommitdiff
path: root/drivers/infiniband/core
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2008-08-07 14:12:03 -0700
committerRoland Dreier <rolandd@cisco.com>2008-08-07 14:12:03 -0700
commit06a91a02e9b249695f964bb59c8b02152c21e90c (patch)
treef4a771f1876f7acb967ceb1033bbe2fc38234018 /drivers/infiniband/core
parent3f44675439b136d51179d31eb5a498383cb38624 (diff)
parentbe43324d8b316fe83a7b4027334f2825f1121c2c (diff)
parent70117b9e866b1fdf7e4e84ffb6f38a7b3e9702f8 (diff)
parente08198169ec5facb3d85bb455efa44a2f8327842 (diff)
parentcd55ef5a10d1a2ea09853bc5fa40aadaf9f80614 (diff)
parent6e0d733d921526e628107fb8b1aff5f7de870d6f (diff)
Merge branches 'cma', 'cxgb3', 'ipath', 'ipoib', 'mad' and 'mlx4' into for-linus