aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/scsi
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2014-01-22 23:24:21 -0800
committerRoland Dreier <roland@purestorage.com>2014-01-22 23:24:21 -0800
commitfb1b5034e4987b158179a62732fb6dfb8f7ec88e (patch)
tree93d02ff7f0f530286fd54d03b632c6eaabc9dcc9 /Documentation/scsi
parent8f399921ea9a562bc8221258c4b8a7bd69577939 (diff)
parent27cdef637c25705b433d5c4deeef4cf8dcb75d6a (diff)
Merge branch 'ip-roce' into for-next
Conflicts: drivers/infiniband/hw/mlx4/main.c
Diffstat (limited to 'Documentation/scsi')
0 files changed, 0 insertions, 0 deletions

Privacy Policy