diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2019-02-21 23:15:10 +1100 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2019-02-21 23:15:10 +1100 |
commit | d0055df0c9c1471c389197a69f43e300185a75aa (patch) | |
tree | 7a1c253162f9ea99bf544fac4ae9219c398cae3f /mm/slob.c | |
parent | Merge branch 'fixes' into next (diff) | |
parent | powerpc/dma: trim the fat from <asm/dma-mapping.h> (diff) | |
download | linux-dev-d0055df0c9c1471c389197a69f43e300185a75aa.tar.xz linux-dev-d0055df0c9c1471c389197a69f43e300185a75aa.zip |
Merge branch 'topic/dma' into next
Merge hch's big DMA rework series. This is in a topic branch in case he
wants to merge it to minimise conflicts.
Diffstat (limited to 'mm/slob.c')
0 files changed, 0 insertions, 0 deletions