Merge branch 'stable/for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Mar 2017 18:23:17 +0000 (10:23 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Mar 2017 18:23:17 +0000 (10:23 -0800)
commit8c2c8ed8b85d4012d26caf1c221c291c687d89f0
treec28ac6bfc83c198b2a61515694d05ad22f2cc25a
parent304362a8bce1a5b7f9491be5a0643cd14a52364d
parent69369f52d28a34c84acb6f2a8a585e743441566a
Merge branch 'stable/for-linus-4.11' of git://git./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
arch/arm/xen/mm.c
drivers/xen/swiotlb-xen.c