]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'core', 'cxgb4', 'ipoib', 'iser', 'iwcm', 'mad', 'misc', 'mlx4', ...
authorRoland Dreier <roland@purestorage.com>
Thu, 14 Aug 2014 15:58:04 +0000 (08:58 -0700)
committerRoland Dreier <roland@purestorage.com>
Thu, 14 Aug 2014 15:58:04 +0000 (08:58 -0700)
commit118ab580c3c5b9a2934b3e52f05b89a50f38e20d
tree32fb414b570f3f1bdac688931d8a4395df49a503
parent314ba8ad4ae62597a243b142f02dca84aa10f9be
parent9ba6f96efc1a545ddd6ace119c1fb65027b07da4
parent4dbc04ba532f189d5b64cc99f9575c43cd5a0d25
parent1d5050fa42ebeb1c46ec9e4728d06ebee3cdbdbc
parent0c51e73648462d1d65e79a20c0463925dcc31f08
parent625bdd98cca295a3aa4a41187ee5a26977fc4470
parent6bbbe29389c29b64df9e62fed9d920903b9379c5
parenta1bb6fc21a08d9c17c3afb19ab57bc213ee60e0d
parent248073d217cf397dc4d5f1838eda28f11f46130e
parent53b74b663dfd8bf5bcd51d4c0f1ffc665bb372e1
parent56e8fbc90f90758cbf050314d9845d083bb5eeb7
Merge branches 'core', 'cxgb4', 'ipoib', 'iser', 'iwcm', 'mad', 'misc', 'mlx4', 'mlx5', 'ocrdma' and 'srp' into for-next
drivers/infiniband/hw/mlx4/main.c
drivers/infiniband/ulp/srpt/ib_srpt.c
drivers/net/ethernet/mellanox/mlx4/mlx4.h
include/linux/mlx4/device.h