diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-28 14:59:19 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-28 14:59:19 +0200 |
| commit | 55f9c40ff632d03c527d6a6ceddcda0a224587a6 (patch) | |
| tree | 215b843439f1d6b7620789ac6e919742db99b7a6 /fs/ecryptfs | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | n2_crypto: Attach on Niagara-T3. (diff) | |
| download | linux-55f9c40ff632d03c527d6a6ceddcda0a224587a6.tar.xz linux-55f9c40ff632d03c527d6a6ceddcda0a224587a6.zip | |
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.
Diffstat (limited to 'fs/ecryptfs')
0 files changed, 0 insertions, 0 deletions