From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 6 Jun 2015 16:06:20 +0000 (-0700)
Subject: Merge branch 'stable/for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=77493bd9b2c9b1e07c2d9ccc481ed4dfc7ef2d1c;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'stable/for-linus-4.1' of git://git./linux/kernel/git/konrad/swiotlb

Pull swiotlb fix from Konrad Rzeszutek Wilk:
 "Tiny little fix which just converts an function to be static.  Really
  tiny"

* 'stable/for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
  swiotlb: do not export map_single function
---

77493bd9b2c9b1e07c2d9ccc481ed4dfc7ef2d1c