Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 27 Aug 2016 06:05:19 +0000 (23:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 27 Aug 2016 06:05:19 +0000 (23:05 -0700)
commit65fc7d54efb6b03dcf61d98aa0fd68fe968c211c
tree9edf5dbcb26edd5fd73accd1a032046ef1e82435
parenta3d34698086aec78ca9169b338468e3ce9bd4b3c
parentfd363bd417ddb6103564c69cfcbd92d9a7877431
Merge tag 'arm64-fixes' of git://git./linux/kernel/git/arm64/linux

Pull ARM64 fix from Catalin Marinas:
 "ARM64 fix to avoid potential TLB conflict when CONFIG_RANDOMIZE_BASE
  is enabled"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: avoid TLB conflict with CONFIG_RANDOMIZE_BASE