diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-08 10:00:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-08 10:00:58 -0700 |
| commit | 278ecbf027c3c559deb225f0cf53a23b7672dacf (patch) | |
| tree | 16f57d6f94d0019e491ee446aac6f96ac05b110f /arch/s390/include/asm/cio.h | |
| parent | dfd437a257924484b144ee750e60affc95562c6d (diff) | |
| parent | 69878ef47562f32e02d0b7975c990e1c0339320d (diff) | |
Merge tag 'm68k-for-v5.3-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
- switch to using the generic remapping DMA allocator
- defconfig updates
* tag 'm68k-for-v5.3-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Implement arch_dma_prep_coherent()
m68k: Use the generic dma coherent remap allocator
m68k: defconfig: Update defconfigs for v5.2-rc1
Diffstat (limited to 'arch/s390/include/asm/cio.h')
0 files changed, 0 insertions, 0 deletions