summaryrefslogtreecommitdiff
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2013-12-23 17:19:02 (GMT)
committerRoland Dreier <roland@purestorage.com>2013-12-23 17:19:02 (GMT)
commit22f12c60e12a4112fdca31582e66fe501600ee2b (patch)
treeaf5b04c8565bc46ac94feccdab880119ea3e668d /drivers/infiniband
parentc00850dd6c517169734ec60eed99502c0912a7d3 (diff)
parent6cc3df840a84dc4e8a874e74cd62a138074922ba (diff)
parent6b59ba609bb61e4fa2ecca7827f170ac07842d64 (diff)
downloadlinux-22f12c60e12a4112fdca31582e66fe501600ee2b.tar.xz
Merge branches 'cxgb4', 'flowsteer' and 'misc' into for-linus