diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-28 10:37:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-28 10:37:06 -0800 |
| commit | 58f02db466900003b801bdfdeddc4d96ce42b7d5 (patch) | |
| tree | 3aec1f9f4aa147fde3facfe6c5f893ac667ce737 /security/integrity/ima/ima_main.c | |
| parent | 43a834d86c136b31ef6ad796725eb474a55a908d (diff) | |
| parent | cb19060abfdecac0d1eb2d2f0e7d6b7a3f8bc4f4 (diff) | |
Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, cacheinfo: Enable L3 CID only on AMD
x86, cacheinfo: Remove NUMA dependency, fix for AMD Fam10h rev D1
x86, cpu: Print AMD virtualization features in /proc/cpuinfo
x86, cacheinfo: Calculate L3 indices
x86, cacheinfo: Add cache index disable sysfs attrs only to L3 caches
x86, cacheinfo: Fix disabling of L3 cache indices
intel-agp: Switch to wbinvd_on_all_cpus
x86, lib: Add wbinvd smp helpers
Diffstat (limited to 'security/integrity/ima/ima_main.c')
0 files changed, 0 insertions, 0 deletions