Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Apr 2012 15:24:21 +0000 (08:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Apr 2012 15:24:21 +0000 (08:24 -0700)
commita92bc5a65ce966ccc49bc8e37c6714c0b4042818
tree86df7b619b654a0ded4cfa0b37f8a0b57b674f96
parent167d82152079debd0a76726972a76ea032d82043
parentca6f327dfdc6b3b90aa0c5247182ae023dce6450
Merge git://git./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