Merge branch 'stable/for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Jun 2015 16:06:20 +0000 (09:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Jun 2015 16:06:20 +0000 (09:06 -0700)
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


Trivial merge