Merge branch 'ip-roce' into for-next
authorRoland Dreier <roland@purestorage.com>
Thu, 23 Jan 2014 07:24:21 +0000 (23:24 -0800)
committerRoland Dreier <roland@purestorage.com>
Thu, 23 Jan 2014 07:24:21 +0000 (23:24 -0800)
commitfb1b5034e4987b158179a62732fb6dfb8f7ec88e
tree93d02ff7f0f530286fd54d03b632c6eaabc9dcc9
parent8f399921ea9a562bc8221258c4b8a7bd69577939
parent27cdef637c25705b433d5c4deeef4cf8dcb75d6a
Merge branch 'ip-roce' into for-next

Conflicts:
drivers/infiniband/hw/mlx4/main.c
drivers/infiniband/Kconfig
drivers/infiniband/core/cma.c
drivers/infiniband/core/verbs.c
drivers/infiniband/hw/mlx4/main.c
drivers/infiniband/hw/mlx4/mlx4_ib.h
drivers/infiniband/hw/mlx4/qp.c
drivers/infiniband/hw/mlx5/qp.c
drivers/infiniband/hw/ocrdma/ocrdma_ah.c
include/linux/mlx4/device.h
include/rdma/ib_verbs.h