Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 19 Jun 2016 01:20:15 +0000 (15:20 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 19 Jun 2016 01:20:15 +0000 (15:20 -1000)
Pull ARM fixes from Russell King:
 "A couple of fixes for pmd_mknotpresent()/pmd_present() for LPAE
  systems"

* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8579/1: mm: Fix definition of pmd_mknotpresent
  ARM: 8578/1: mm: ensure pmd_present only checks the valid bit


Trivial merge