summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2011-01-29 20:45:04 -0800
committerRoland Dreier <roland@purestorage.com>2011-01-29 20:45:04 -0800
commite51c7b1ab05d4a6fe4d153b2769290d37e077479 (patch)
tree97b3fe2f6cb216a47237b2f57f5e58ae79837b85 /drivers/infiniband
parentf9a4f6dcdd3f9b6d938484c2c394f39007c14f38 (diff)
parente86f8b06f5fa884a84c22b2dcd0df37ed0a75827 (diff)
parent94788657c94169171971968c9d4b6222c5e704aa (diff)
parent96e61fa55e86fbd10c526567aacae5b484c4b63c (diff)
parent31dd272e8cbb32ef31a411492cc642c363bb54b9 (diff)
parentd70585f7de4b4c3725062b7ce7d492f4903e4833 (diff)
downloadlinux-e51c7b1ab05d4a6fe4d153b2769290d37e077479.tar.gz
linux-e51c7b1ab05d4a6fe4d153b2769290d37e077479.tar.bz2
linux-e51c7b1ab05d4a6fe4d153b2769290d37e077479.zip
Merge branches 'amso1100', 'cma', 'cxgb4', 'misc', 'mlx4' and 'qib' into for-next