diff options
author | Roland Dreier <roland@purestorage.com> | 2013-12-23 09:19:02 -0800 |
---|---|---|
committer | Roland Dreier <roland@purestorage.com> | 2013-12-23 09:19:02 -0800 |
commit | 22f12c60e12a4112fdca31582e66fe501600ee2b (patch) | |
tree | af5b04c8565bc46ac94feccdab880119ea3e668d /drivers/infiniband/core | |
parent | RDMA/cxgb4: Make _c4iw_write_mem_dma() static (diff) | |
parent | IB/uverbs: Check access to userspace response buffer in extended command (diff) | |
parent | RDMA/iwcm: Don't touch cm_id after deref in rem_ref (diff) | |
download | linux-dev-22f12c60e12a4112fdca31582e66fe501600ee2b.tar.xz linux-dev-22f12c60e12a4112fdca31582e66fe501600ee2b.zip |
Merge branches 'cxgb4', 'flowsteer' and 'misc' into for-linus