]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'core', 'cxgb3', 'cxgb4', 'iser', 'iwpm', 'misc', 'mlx4', 'mlx5',...
authorRoland Dreier <roland@purestorage.com>
Tue, 10 Jun 2014 17:12:14 +0000 (10:12 -0700)
committerRoland Dreier <roland@purestorage.com>
Tue, 10 Jun 2014 17:12:14 +0000 (10:12 -0700)
commit4564ed91b1eefd189bf78db06cfbf15331b64311
tree3b06b0dc4a1b6d9b2d1e289adaaf68c52f8a85d7
parentf30cf9a56d0c0ebeb89077996f46d0a63666a9ca
parent3a4cfb295d37da687a6153a6e3c1312fb205a91a
parentb90f165641851d13d0ca15206e09df3d92123183
parentd088f00a801d9e8cb3e0b9403126a827fe1a8fbc
parentcaeeb25e0a1e93728a995093ebe5e8b95972b150
parent7f9f7aa3e4d2235a826fab82bba8470f3394ccbd
parentfbacfd69cf40ecab22e47e4d71123fb3ec7823b8
parentfdf3e0691ec8d92b86984d6d27f78aa7b81700f7
parent1c14f15fba3862db2aa2b750dcb393f634ccfb3c
parentf737c3a376c5804304c2fcfc3eae3ade3b61e7ab
parentd326c8de13ee3740f535fb6164998ffb37f73af0
parentfc73c572fbf484309e7eebab7b19d9ee0c524a2e
parent0cd377523e14d33a73cd2c4d396ae3837e66bef3
Merge branches 'core', 'cxgb3', 'cxgb4', 'iser', 'iwpm', 'misc', 'mlx4', 'mlx5', 'noio', 'ocrdma', 'qib', 'srp' and 'usnic' into for-next
drivers/infiniband/hw/cxgb4/cm.c
drivers/infiniband/hw/cxgb4/device.c
drivers/infiniband/hw/mlx4/qp.c
drivers/net/ethernet/mellanox/mlx4/mlx4.h
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
include/linux/mlx4/device.h
include/rdma/ib_verbs.h