Merge branches 'mlx5-1' and 'srp-1' into k.o/for-4.7

Browse source

...

This commit is contained in:

Doug Ledford 2016-05-12 14:21:02 -04:00

parent 80835cba4b 3849e44d1c

commit 321aebb880

2 changed files with 33 additions and 20 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

52

drivers/infiniband/ulp/srp/ib_srp.c

View file

1

drivers/infiniband/ulp/srp/ib_srp.h

View file