Skip to content
Commit 0b5ad7b9 authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'for-linus' into fixes 



Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>

 Conflicts:
	drivers/dma/idxd/sysfs.c
parents 87730ccb 6bd0dffa
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment