projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 304362a 69369f5)
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)
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

1  2 
arch/arm/xen/mm.c patch | diff1 | diff2 | blob | history
drivers/xen/swiotlb-xen.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/xen/mm.c
Simple merge
diff --cc drivers/xen/swiotlb-xen.c
Simple merge
John Crispins staging tree