Merge branch 'stable/for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 Jan 2017 20:17:07 +0000 (12:17 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 Jan 2017 20:17:07 +0000 (12:17 -0800)
commit2b4321503e62523e701405163a034875e92d68cf
tree0a8540238886eb30d21513d10569ed64b6e819f4
parent3aebae061cea6f6627ab882a73de7b0b21af3127
parentf1225ee4c8fcf09afaa199b8b1f0450f38b8cd11
Merge branch 'stable/for-linus-4.10' of git://git./linux/kernel/git/konrad/swiotlb

Pull swiotlb fix from Konrad Rzeszutek Wilk:
 "An ARM fix in the Xen SWIOTLB - mainly the translation of physical to
  bus addresses was done just a tad too late"

* 'stable/for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
  swiotlb-xen: update dev_addr after swapping pages