diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-08 02:55:16 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-08 02:55:16 +0200 |
| commit | 4f572efde4600a577d1fc0bcee191bc9cec842f8 (patch) | |
| tree | dcd27d87a620ef89bdf70aa71de33bd36ec93df7 /drivers/watchdog/rdc321x_wdt.c | |
| parent | Merge tag 'dmaengine-fix-4.18-rc4' of git://git.infradead.org/users/vkoul/sla... (diff) | |
| parent | Revert "iommu/intel-iommu: Enable CONFIG_DMA_DIRECT_OPS=y and clean up intel_... (diff) | |
| download | linux-4f572efde4600a577d1fc0bcee191bc9cec842f8.tar.xz linux-4f572efde4600a577d1fc0bcee191bc9cec842f8.zip | |
Merge tag 'dma-mapping-4.18-3' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping fix from Christoph Hellwig:
"Revert an incorrect dma-mapping commit for 4.18-rc"
* tag 'dma-mapping-4.18-3' of git://git.infradead.org/users/hch/dma-mapping:
Revert "iommu/intel-iommu: Enable CONFIG_DMA_DIRECT_OPS=y and clean up intel_{alloc,free}_coherent()"
Diffstat (limited to 'drivers/watchdog/rdc321x_wdt.c')
0 files changed, 0 insertions, 0 deletions