From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 19 Mar 2013 21:47:11 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
X-Git-Tag: v3.12-rc1~1199
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5c7c3361d177120a9980971380b52f84c2d9c97d;p=kernel%2Fkernel-generic.git

Merge git://git./linux/kernel/git/davem/sparc

Pull sparc fixes from David Miller:
 "Just some minor fixups, a sunsu console setup panic cure, and
  recognition of a Fujitsu sun4v cpu."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: remove unused "config BITS"
  sparc: delete "if !ULTRA_HAS_POPULATION_COUNT"
  sparc64: correctly recognize SPARC64-X chips
  sparc,leon: fix GRPCI2 device0 PCI config space access
  sunsu: Fix panic in case of nonexistent port at "console=ttySY" cmdline option
---

5c7c3361d177120a9980971380b52f84c2d9c97d