| commit | 0b5ad7b9522e6172342511fac6114fd8b7eb622a | [log] [tgz] |
|---|---|---|
| author | Vinod Koul <vkoul@kernel.org> | Wed Aug 05 19:02:07 2020 +0530 |
| committer | Vinod Koul <vkoul@kernel.org> | Wed Aug 05 19:02:07 2020 +0530 |
| tree | b6a29560e6364bd98634564181cab54a3b6164a4 | |
| parent | 87730ccbddcb48478b1b88e88b14e73424130764 [diff] | |
| parent | 6bd0dffa1a6e19e73964ae47c964f57c625cce05 [diff] |
Merge branch 'for-linus' into fixes Signed-off-by: Vinod Koul <vkoul@kernel.org> Conflicts: drivers/dma/idxd/sysfs.c