tree 86df7b619b654a0ded4cfa0b37f8a0b57b674f96
parent 167d82152079debd0a76726972a76ea032d82043
parent ca6f327dfdc6b3b90aa0c5247182ae023dce6450
author Linus Torvalds <torvalds@linux-foundation.org> 1333553061 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1333553061 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Pull Sparc fixes from David Miller:
 "One build regression and one serial probe regression fix on sparc."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  serial/sunzilog: fix keyboard on SUN SPARCstation
  sparc: pgtable_64: change include order