From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 7 Mar 2017 18:23:17 +0000 (-0800)
Subject: Merge branch 'stable/for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.11-rc2~38
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8c2c8ed8b85d4012d26caf1c221c291c687d89f0;p=karo-tx-linux.git

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
---

8c2c8ed8b85d4012d26caf1c221c291c687d89f0