Merge branches 'cxgb4', 'ipoib' and 'qib' into for-next

drivers/infiniband/hw/qib/qib.h

drivers/infiniband/hw/qib/qib_7322_regs.h

drivers/infiniband/hw/qib/qib_diag.c

drivers/infiniband/hw/qib/qib_iba6120.c

drivers/infiniband/hw/qib/qib_iba7322.c

drivers/infiniband/hw/qib/qib_init.c

drivers/infiniband/hw/qib/qib_pcie.c

drivers/infiniband/hw/qib/qib_tx.c

drivers/infiniband/ulp/ipoib/ipoib_main.c