diff options
| author |   Roland Dreier <roland@purestorage.com> | 2014-01-22 23:24:21 -0800 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2014-01-22 23:24:21 -0800 |
| commit | fb1b5034e4987b158179a62732fb6dfb8f7ec88e (patch) | |
| tree | 93d02ff7f0f530286fd54d03b632c6eaabc9dcc9 /MAINTAINERS | |
| parent | Merge branches 'cma', 'cxgb4', 'flowsteer', 'ipoib', 'misc', 'mlx4', 'mlx5', 'ocrdma', 'qib', 'srp' and 'usnic' into for-next (diff) | |
| parent | IB/mlx4: Use IS_ENABLED(CONFIG_IPV6) (diff) | |
| download | linux-dev-fb1b5034e4987b158179a62732fb6dfb8f7ec88e.tar.xz linux-dev-fb1b5034e4987b158179a62732fb6dfb8f7ec88e.zip | |
Merge branch 'ip-roce' into for-next
Conflicts:
drivers/infiniband/hw/mlx4/main.c
Diffstat (limited to 'MAINTAINERS')
0 files changed, 0 insertions, 0 deletions