| commit | 8c2c8ed8b85d4012d26caf1c221c291c687d89f0 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Mar 07 10:23:17 2017 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Mar 07 10:23:17 2017 -0800 |
| tree | c28ac6bfc83c198b2a61515694d05ad22f2cc25a | |
| parent | 304362a8bce1a5b7f9491be5a0643cd14a52364d [diff] | |
| parent | 69369f52d28a34c84acb6f2a8a585e743441566a [diff] |
Merge branch 'stable/for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb Pull swiotlb updates from Konrad Rzeszutek Wilk: "Two tiny implementations of the DMA API for callback in ARM (for Xen)" * 'stable/for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb: swiotlb-xen: implement xen_swiotlb_get_sgtable callback swiotlb-xen: implement xen_swiotlb_dma_mmap callback