Merge tag 'for-linus-4.12b-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Jun 2017 16:59:51 +0000 (09:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Jun 2017 16:59:51 +0000 (09:59 -0700)
commiteb4125dfdb1f64a5e41da8315bff48f67e5d1712
tree1171db08210b42cb7df472293be36c9b855d44af
parenta92f63cd13776e35d3ccb63187d1d95ab16f24a5
parent753c09b5652bb4fe53e2db648002ec64b32b8827
Merge tag 'for-linus-4.12b-rc5-tag' of git://git./linux/kernel/git/xen/tip

Pull xen fix from Juergen Gross:
 "A fix for Xen on ARM when dealing with 64kB page size of a guest"

* tag 'for-linus-4.12b-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/privcmd: Support correctly 64KB page granularity when mapping memory