| commit | 55f9c40ff632d03c527d6a6ceddcda0a224587a6 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jul 28 05:59:19 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jul 28 05:59:19 2011 -0700 |
| tree | 215b843439f1d6b7620789ac6e919742db99b7a6 | |
| parent | d5eab9152a3b4ce962c02ad0a0e4d0ec94aadd92 [diff] | |
| parent | eb7caf35951b1a56aabee028c1b20727abccc34f [diff] |
Merge git://git.kernel.org/pub/scm/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.