diff options
| author | Roland Dreier <roland@purestorage.com> | 2014-09-22 13:05:40 -0400 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2014-09-22 13:05:40 -0400 |
| commit | 3bdad2d13fa62bcb59ca2506e74ce467ea436586 (patch) | |
| tree | c1aa500b31433206cf023d1114a678e1dce1efcf /init | |
| parent | 87773dd56d5405ac28119fcfadacefd35877c18f (diff) | |
| parent | 68f9d83c7765b110de54677573e9538f3ca6ca04 (diff) | |
| parent | 61aabb3c91c1b03478ffc1a4a2573f825e7f35f9 (diff) | |
| parent | 25476b0209b2e48dfb689e1b4cf7278875082b1f (diff) | |
| parent | f0c2c225dfe9dfb668fe72eadabb8a3ec74ca036 (diff) | |
| parent | 85cbb7c728bf39c45a9789b88c9471c0d7a58b0e (diff) | |
Merge branches 'core', 'ipoib', 'iser', 'mlx4', 'ocrdma' and 'qib' into for-next