From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 4 Apr 2012 15:24:21 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
X-Git-Tag: firefly_0821_release~3680^2~3146
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a92bc5a65ce966ccc49bc8e37c6714c0b4042818;p=firefly-linux-kernel-4.4.55.git

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
---

a92bc5a65ce966ccc49bc8e37c6714c0b4042818