Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 31 Oct 2016 15:10:38 +0000 (08:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 31 Oct 2016 15:10:38 +0000 (08:10 -0700)
Pull ARM fixes from Russell King:
 "A fix for a regression on ARMv4T CPUs, and wiring up the new pkey
  syscalls for ARM"

* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: wire up new pkey syscalls
  ARM: fix oops when using older ARMv4T CPUs


Trivial merge