tree b6a29560e6364bd98634564181cab54a3b6164a4
parent 87730ccbddcb48478b1b88e88b14e73424130764
parent 6bd0dffa1a6e19e73964ae47c964f57c625cce05
author Vinod Koul <vkoul@kernel.org> 1596634327 +0530
committer Vinod Koul <vkoul@kernel.org> 1596634327 +0530

Merge branch 'for-linus' into fixes

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

 Conflicts:
	drivers/dma/idxd/sysfs.c