From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 28 Jul 2011 12:59:19 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
X-Git-Tag: v3.1-rc1~129
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=55f9c40ff632d03c527d6a6ceddcda0a224587a6;p=platform%2Fkernel%2Flinux-3.10.git

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  n2_crypto: Attach on Niagara-T3.
  n2rng: Attach on Niagara-T3.
  sparc: Detect and handle UltraSPARC-T3 cpu types.
  sparc: Don't do expensive hypervisor PCR write unless necessary.
  sparc: Add T3 sun4v cpu type and hypervisor group defines.
  sparc: Don't leave sparc_pmu_type NULL on sun4v.
---

55f9c40ff632d03c527d6a6ceddcda0a224587a6