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)
commit77493bd9b2c9b1e07c2d9ccc481ed4dfc7ef2d1c
tree6a85413a1face6ef58b1b9eef639ce68858c7490
parent7dedcca09e9a751fd14fdb8e9882d675b23b2c0e
parent023600f192be3f5776336e2c61d577b551a1ca9c
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