| commit | 55f9c40ff632d03c527d6a6ceddcda0a224587a6 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 28 Jul 2011 12:59:19 +0000 (28 05:59 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 28 Jul 2011 12:59:19 +0000 (28 05:59 -0700) | ||
| tree | 215b843439f1d6b7620789ac6e919742db99b7a6 | treesnapshot (tar.gz zip) |
| parent | d5eab9152a3b4ce962c02ad0a0e4d0ec94aadd92 | commitdiff |
| parent | eb7caf35951b1a56aabee028c1b20727abccc34f | commitdiff |
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.
* 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.