summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2011-01-30 05:45:04 +0100
committerRoland Dreier <roland@purestorage.com>2011-01-30 05:45:04 +0100
commite51c7b1ab05d4a6fe4d153b2769290d37e077479 (patch)
tree97b3fe2f6cb216a47237b2f57f5e58ae79837b85 /drivers/infiniband
parentRDMA/amso1100: Fix compile warnings (diff)
parentRDMA/ucma: Copy iWARP route information on queries (diff)
parentRDMA/cxgb4: Set the correct device physical function for iWARP connections (diff)
parentRDMA: Update missed conversion of flush_scheduled_work() (diff)
parentmlx4_core: Add ConnectX-3 device IDs (diff)
parentIB/qib: Hold link for TX SERDES settings (diff)
downloadlinux-e51c7b1ab05d4a6fe4d153b2769290d37e077479.tar.xz
linux-e51c7b1ab05d4a6fe4d153b2769290d37e077479.zip
Merge branches 'amso1100', 'cma', 'cxgb4', 'misc', 'mlx4' and 'qib' into for-next