From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 30 Sep 2011 02:24:33 +0000 (-0700)
Subject: Merge git://github.com/davem330/sparc
X-Git-Tag: Ubuntu-5.0.0-8.9~17622
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=5fe858b5b76be3cb1b1cf3ea40b7ca6706f8329c;p=mirror_ubuntu-disco-kernel.git

Merge git://github.com/davem330/sparc

* git://github.com/davem330/sparc:
  sparc64: Force the execute bit in OpenFirmware's translation entries.
  sparc: Make '-p' boot option meaningful again.
  sparc, exec: remove redundant addr_limit assignment
  sparc64: Future proof Niagara cpu detection.
---

5fe858b5b76be3cb1b1cf3ea40b7ca6706f8329c