]> 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)
commit051e50775f6f3bbb50aee3b318a0d9f782bcf649
tree3b06b0dc4a1b6d9b2d1e289adaaf68c52f8a85d7
parent5aa99c750149e4332a73a82c2c7ef51419991d2d
parent1fdaa8afcabfa8f5175dd81476f0b9a41ef396f3
parentfdc65082200a153c099c1d91d7affe2cadf7ab62
parent2811b463884d354c166f3540b5ef6bdbfc3378e0
parentaa68840f8083483972e1f1eba3ef074d89aad07b
parentcf04a0e8037c24a029038bf12a8486666a5dbae2
parent7490d2e5ed94718dbe84eca888f30117f9c10e60
parent424d1cd274e01fe8707033f5bae924527a1654e3
parent6c450dcaca50d09d5ce4b7ee42ce7e3519c2cbd2
parentf3bac76a50604107be1b0d3b4f25cc0b7e2b47af
parent1e22174142c47425c12be9f6e12e7fb66329464f
parenta4cf8ca09ccfcd76cc97da53793675bc8e58aa60
parentefbe2557e1fa4dd3595d972396b80c55c29cbea5
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