]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branches 'i40iw', 'sriov' and 'hfi1' into k.o/for-4.6
authorDoug Ledford <dledford@redhat.com>
Mon, 21 Mar 2016 21:32:23 +0000 (17:32 -0400)
committerDoug Ledford <dledford@redhat.com>
Mon, 21 Mar 2016 21:32:23 +0000 (17:32 -0400)
commit520a07bff6fbb23cac905007d74c67058b189acb
treefeef97d91e912f5028a469a417636363c9dd1650
parent34abf9ed73f2cf4fcc69eefd7e0af225cf9671a8
parent68996a6e760e5c74654723eeb57bf65628ae87f4
parent5511d7810752f426f0a9f999100fd249d352c2ef
Merge branches 'i40iw', 'sriov' and 'hfi1' into k.o/for-4.6
MAINTAINERS
drivers/infiniband/Kconfig
include/rdma/ib_verbs.h
include/uapi/rdma/rdma_netlink.h