diff options
| author | Vinod Koul <vkoul@kernel.org> | 2022-01-05 12:48:05 +0530 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2022-01-05 12:48:05 +0530 |
| commit | 5cb664fbeba0a11592c1d2774833a4cc49d1ca19 (patch) | |
| tree | f5eb47d25d0b90cebbe46d0cbe33bf39bc339eef /drivers/dma/dmaengine.h | |
| parent | 105a8c525675bb7d4d64871f9b2edf39460de881 (diff) | |
| parent | 822c9f2b833c53fc67e8adf6f63ecc3ea24d502c (diff) | |
Merge branch 'fixes' into next
We have a conflict in idxd driver between 'fixes' and 'next' and there
are patches dependent on this so, merge the 'fixes' branch into next
Diffstat (limited to 'drivers/dma/dmaengine.h')
0 files changed, 0 insertions, 0 deletions