]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'amso1100', 'cma', 'cxgb3', 'cxgb4', 'fdr', 'ipath', 'ipoib', 'misc...
authorRoland Dreier <roland@purestorage.com>
Tue, 1 Nov 2011 16:37:08 +0000 (09:37 -0700)
committerRoland Dreier <roland@purestorage.com>
Tue, 1 Nov 2011 16:37:08 +0000 (09:37 -0700)
commit59e4b42b6463ac1cb1211bfeceda318832a1cadf
tree5ae8663d2bc2eb9e796bfb689f3e462a14742e06
parente16243857bd635ecd00df3b7bd809cb2ec1ce096
parent4b717885d86d3096ad795c03398adfb1ec6e712e
parent84a9b147451fb425266ebfc4dd70808f84ebc24e
parent8473f35365a47c7ff47cae05e20ff81454d23b03
parentbdc2f41efe0e016aa62dbf606f4e4d0e4ac823b3
parent08d73959af9073806a9584e1d7d77277b777bfae
parent282a9d4db39ee06ea0e9de3381cadbb7eeccf2dd
parent86db28da23963c6786489684e4b593bbebbb0807
parentce25783abf812b6b00589e56f2fca10668b32e21
parentdeb4202cabdd92088259c73f6d93e0fb2d4d687d
parentde54dbff80f7f7aeed25a16a89dd55ebed2b26fd
parent5743a450ad5d936f863ba2fb681f81552bb88557
Merge branches 'amso1100', 'cma', 'cxgb3', 'cxgb4', 'fdr', 'ipath', 'ipoib', 'misc', 'mlx4', 'misc', 'nes', 'qib' and 'xrc' into for-next
17 files changed:
drivers/infiniband/core/cma.c
drivers/infiniband/core/ucma.c
drivers/infiniband/core/uverbs_main.c
drivers/infiniband/core/verbs.c
drivers/infiniband/hw/cxgb4/iw_cxgb4.h
drivers/infiniband/hw/cxgb4/qp.c
drivers/infiniband/hw/mlx4/main.c
drivers/infiniband/hw/mlx4/qp.c
drivers/infiniband/hw/nes/nes_cm.c
drivers/infiniband/hw/nes/nes_cm.h
drivers/infiniband/hw/nes/nes_verbs.h
drivers/infiniband/ulp/ipoib/ipoib_cm.c
drivers/net/mlx4/main.c
drivers/net/mlx4/mlx4.h
drivers/net/mlx4/port.c
include/linux/mlx4/device.h
include/rdma/ib_verbs.h