commit 5634347dee31373a8faf084f4cdbf6d5ea0b03a4
author Linus Torvalds <torvalds@linux-foundation.org> Fri Oct 02 14:54:16 2015 -0400
committer Linus Torvalds <torvalds@linux-foundation.org> Fri Oct 02 14:54:16 2015 -0400
tree 1ff99fa3cbdd23eb25dcb5a4f83e27389f61786b
parent b55a97e759c9e9efdce0470f520026383c514a13
parent ee556d00cf20012e889344a0adbbf809ab5015a3

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

Pull arm64 fixes from Catalin Marinas:

 - Fix for transparent huge page change_protection() logic which was
   inadvertently changing a huge pmd page into a pmd table entry.

 - Function graph tracer panic fix caused by the return_to_handler code
   corrupting the multi-regs function return value (composite types).

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: ftrace: fix function_graph tracer panic
  arm64: Fix THP protection change logic