diff options
| author | Roland Dreier | 2014-01-23 08:24:21 +0100 |
|---|---|---|
| committer | Roland Dreier | 2014-01-23 08:24:21 +0100 |
| commit | fb1b5034e4987b158179a62732fb6dfb8f7ec88e (patch) | |
| tree | 93d02ff7f0f530286fd54d03b632c6eaabc9dcc9 /drivers/scsi/scsi_transport_srp.c | |
| parent | Merge branches 'cma', 'cxgb4', 'flowsteer', 'ipoib', 'misc', 'mlx4', 'mlx5', ... (diff) | |
| parent | IB/mlx4: Use IS_ENABLED(CONFIG_IPV6) (diff) | |
| download | kernel-qcow2-linux-fb1b5034e4987b158179a62732fb6dfb8f7ec88e.tar.gz kernel-qcow2-linux-fb1b5034e4987b158179a62732fb6dfb8f7ec88e.tar.xz kernel-qcow2-linux-fb1b5034e4987b158179a62732fb6dfb8f7ec88e.zip | |
Merge branch 'ip-roce' into for-next
Conflicts:
drivers/infiniband/hw/mlx4/main.c
Diffstat (limited to 'drivers/scsi/scsi_transport_srp.c')
0 files changed, 0 insertions, 0 deletions