tree f9fbf8ba1b35ef2741b95b8a42d2eec9871e41cf
parent 8e8e500fcadaf2e39f4f119ae60c289456527727
parent f4142cba4e4065a416e78ade905bea29ff3930e6
author Linus Torvalds <torvalds@linux-foundation.org> 1317349473 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1317349473 -0700

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.