Merge git://github.com/davem330/sparc
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Sep 2011 02:24:33 +0000 (19:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Sep 2011 02:24:33 +0000 (19:24 -0700)
commit5fe858b5b76be3cb1b1cf3ea40b7ca6706f8329c
treef9fbf8ba1b35ef2741b95b8a42d2eec9871e41cf
parent8e8e500fcadaf2e39f4f119ae60c289456527727
parentf4142cba4e4065a416e78ade905bea29ff3930e6
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.