From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 19 Jun 2016 01:20:15 +0000 (-1000)
Subject: Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
X-Git-Tag: v4.7-rc4~4
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=c141afd1a28793c08c88325aa64b773be6f79ccf;p=linux-2.6-block.git

Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm

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
---

c141afd1a28793c08c88325aa64b773be6f79ccf