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

Merge branch 'mad' into for-linus 

Conflicts:
	drivers/infiniband/core/mad.c
parents 45c448a1 b76aabc3
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment