diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-07 10:23:17 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-07 10:23:17 -0800 |
commit | 8c2c8ed8b85d4012d26caf1c221c291c687d89f0 (patch) | |
tree | c28ac6bfc83c198b2a61515694d05ad22f2cc25a /mm/oom_kill.c | |
parent | 304362a8bce1a5b7f9491be5a0643cd14a52364d (diff) | |
parent | 69369f52d28a34c84acb6f2a8a585e743441566a (diff) | |
download | linux-stable-8c2c8ed8b85d4012d26caf1c221c291c687d89f0.tar.gz linux-stable-8c2c8ed8b85d4012d26caf1c221c291c687d89f0.tar.bz2 linux-stable-8c2c8ed8b85d4012d26caf1c221c291c687d89f0.zip |
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
Diffstat (limited to 'mm/oom_kill.c')
0 files changed, 0 insertions, 0 deletions