Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jan 2017 23:18:58 +0000 (15:18 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jan 2017 23:18:58 +0000 (15:18 -0800)
commitb1ee51702e12a99d35d7c11d1d2b5cd324001ee2
treee7ad1ca152f914fccf09c65fb558779e57ed20a3
parent5824f92463e978f27985b748c69d94ee7caa8230
parent9d84fb27fa135c99c9fe3de33628774a336a70a8
Merge tag 'arm64-fixes' of git://git./linux/kernel/git/arm64/linux

Pull arm64 fixes from Catalin Marinas:

 - re-introduce the arm64 get_current() optimisation

 - KERN_CONT fallout fix in show_pte()

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: restore get_current() optimisation
  arm64: mm: fix show_pte KERN_CONT fallout