]> git.proxmox.com Git - mirror_ubuntu-eoan-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)
commitd087f6ad724dfbcdc3df8e0191b80d9d8d839e71
tree32fb414b570f3f1bdac688931d8a4395df49a503
parent9376932d0c26d5f5f89c95d5bd45123bba96d3a9
parent678ea9b5baab6800692b249bdba77c3c07261d61
parente42fa2092c1049ac9c0e38aaac39ef3c40e91a36
parent8d4aca7f04a098086c6545df158e5a022cbbfcd1
parent2f0304d21867476394cd51a54e97f7273d112261
parent1471cb6ca67990a306500e69e52ffb28c93ccbbc
parentdb1044d458a287c18c4d413adc4ad12e92e253b5
parenta57f23f675bf679b2be093571ae09fe2199c5e76
parenta8f731ebd1b4f94cf52ff07fe524414b4fbf9793
parent96c51abecc4379273fb751ff44eb57e4b243b5f0
parentda05be290f5040e488ea4d13edc4da889f6f6929
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