| commit | fb1b5034e4987b158179a62732fb6dfb8f7ec88e | [log] [tgz] |
|---|---|---|
| author | Roland Dreier <roland@purestorage.com> | Wed Jan 22 23:24:21 2014 -0800 |
| committer | Roland Dreier <roland@purestorage.com> | Wed Jan 22 23:24:21 2014 -0800 |
| tree | 93d02ff7f0f530286fd54d03b632c6eaabc9dcc9 | |
| parent | 8f399921ea9a562bc8221258c4b8a7bd69577939 [diff] | |
| parent | 27cdef637c25705b433d5c4deeef4cf8dcb75d6a [diff] |
Merge branch 'ip-roce' into for-next Conflicts: drivers/infiniband/hw/mlx4/main.c