Commit 30a5125e authored by Stephen Rothwell's avatar Stephen Rothwell
Browse files

Merge remote-tracking branch 'hmm/hmm' 

# Conflicts:
#	drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c
#	drivers/infiniband/hw/mlx5/odp.c
parents a2947b9b 93f4e735
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