From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 22 Apr 2013 22:00:59 +0000 (-0700)
Subject: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=824282ca7d250bd7c301f221c3cd902ce906d731;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'upstream' of git://git.linux-mips.org/ralf/upstream-linus

Pull MIPS fix from Ralf Baechle:
 "Revert the change of the definition of PAGE_MASK which was prettier
  but broke a few relativly rare platforms"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  Revert "MIPS: page.h: Provide more readable definition for PAGE_MASK."
---

824282ca7d250bd7c301f221c3cd902ce906d731