diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-11 14:01:10 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-11 14:01:10 -0800 |
commit | 5ea8d3759244590defd369828c965101c97b65e1 (patch) | |
tree | 534f4fea14ee177f12ad16304f159aaefb7f1f8f /security/integrity/ima/ima.h | |
parent | f2d6cff7f5255985939fb752daee4fab397ed61d (diff) | |
parent | 681ee44d40d7c93b42118320e4620d07d8704fd6 (diff) |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, apic: Don't use logical-flat mode when CPU hotplug may exceed 8 CPUs
x86-32: Make AT_VECTOR_SIZE_ARCH=2
x86/agp: Fix amd64-agp module initialization regression
x86, doc: Fix minor spelling error in arch/x86/mm/gup.c
Diffstat (limited to 'security/integrity/ima/ima.h')
0 files changed, 0 insertions, 0 deletions