diff options
| author | Roland Dreier <roland@purestorage.com> | 2014-08-14 08:58:04 -0700 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2014-08-14 08:58:04 -0700 |
| commit | d087f6ad724dfbcdc3df8e0191b80d9d8d839e71 (patch) | |
| tree | 32fb414b570f3f1bdac688931d8a4395df49a503 /include/uapi | |
| parent | 9376932d0c26d5f5f89c95d5bd45123bba96d3a9 (diff) | |
| parent | 678ea9b5baab6800692b249bdba77c3c07261d61 (diff) | |
| parent | e42fa2092c1049ac9c0e38aaac39ef3c40e91a36 (diff) | |
| parent | 8d4aca7f04a098086c6545df158e5a022cbbfcd1 (diff) | |
| parent | 2f0304d21867476394cd51a54e97f7273d112261 (diff) | |
| parent | 1471cb6ca67990a306500e69e52ffb28c93ccbbc (diff) | |
| parent | db1044d458a287c18c4d413adc4ad12e92e253b5 (diff) | |
| parent | a57f23f675bf679b2be093571ae09fe2199c5e76 (diff) | |
| parent | a8f731ebd1b4f94cf52ff07fe524414b4fbf9793 (diff) | |
| parent | 96c51abecc4379273fb751ff44eb57e4b243b5f0 (diff) | |
| parent | da05be290f5040e488ea4d13edc4da889f6f6929 (diff) | |
Merge branches 'core', 'cxgb4', 'ipoib', 'iser', 'iwcm', 'mad', 'misc', 'mlx4', 'mlx5', 'ocrdma' and 'srp' into for-next