diff options
| author | Linus Torvalds <[email protected]> | 2017-09-21 15:51:03 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2017-09-21 15:51:03 +0000 |
| commit | 20c29a97559c9a59991170d3d648884a9f6aacd3 (patch) | |
| tree | 2e59d9f29fd9b767adba2b303ca96cdf8b7854aa /net/unix/af_unix.c | |
| parent | Merge tag 'trace-v4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | dma-coherent: fix rmem_dma_device_init regression (diff) | |
| download | kernel-20c29a97559c9a59991170d3d648884a9f6aacd3.tar.gz kernel-20c29a97559c9a59991170d3d648884a9f6aacd3.zip | |
Merge tag 'dma-mapping-4.14-2' of git://git.infradead.org/users/hch/dma-mapping
Pull dma mapping fix from Christoph Hellwig:
"A fix for a fix that went in this merge window from Arnd"
* tag 'dma-mapping-4.14-2' of git://git.infradead.org/users/hch/dma-mapping:
dma-coherent: fix rmem_dma_device_init regression
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions