]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit5cbb96b51cce2f0ef1563d5d99b7653caf0cdde6
treec28ac6bfc83c198b2a61515694d05ad22f2cc25a
parent5824ebc4ffd8dd8225c4b7f3d5db37ee50707128
parentfa438dc86c8c50d74901987906c27f1fd32cca04
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
arch/arm/xen/mm.c
drivers/xen/swiotlb-xen.c