]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
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)
* 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.


Trivial merge