Skip to content
Commit fb1b5034 authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branch 'ip-roce' into for-next 

Conflicts:
	drivers/infiniband/hw/mlx4/main.c
parents 8f399921 27cdef63
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment