diff options
author | Doug Ledford <dledford@redhat.com> | 2016-05-26 17:55:19 +0200 |
---|---|---|
committer | Doug Ledford <dledford@redhat.com> | 2016-05-26 17:55:19 +0200 |
commit | e6f61130ed7a124138c4f7b1bd35e24e8113cb83 (patch) | |
tree | b7108ae9ae91d17c9850fc9d58b45120622196aa /include | |
parent | RDMA/cxgb3: device driver frees DMA memory with different size (diff) | |
parent | IB/IPoIB: Allow setting the device address (diff) | |
parent | IB/core: Add IP to GID netlink offload (diff) | |
download | linux-e6f61130ed7a124138c4f7b1bd35e24e8113cb83.tar.xz linux-e6f61130ed7a124138c4f7b1bd35e24e8113cb83.zip |
Merge branches 'misc-4.7-2', 'ipoib' and 'ib-router' into k.o/for-4.7