diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-28 23:57:01 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-28 23:57:01 +0400 |
| commit | a947e23a8ec04bccbfe98c5a2d64cd1f88b612d5 (patch) | |
| tree | d64bfae3af141014e93b32036ee8cb3202655ecc /include/linux/tpm.h | |
| parent | 08a8b79600101fd6e13dcf05409b330e7f5b0478 (diff) | |
| parent | 9a3865b185e77d1a4ca2d8356e37c19b78168961 (diff) | |
| download | linux-a947e23a8ec04bccbfe98c5a2d64cd1f88b612d5.tar.xz | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, asm: Clean up desc.h a bit
x86, amd: Do not enable ARAT feature on AMD processors below family 0x12
x86: Move do_page_fault()'s error path under unlikely()
x86, efi: Retain boot service code until after switching to virtual mode
x86: Remove unnecessary check in detect_ht()
x86: Reorder mm_context_t to remove x86_64 alignment padding and thus shrink mm_struct
x86, UV: Clean up uv_tlb.c
x86, UV: Add support for SGI UV2 hub chip
x86, cpufeature: Update CPU feature RDRND to RDRAND
Diffstat (limited to 'include/linux/tpm.h')
0 files changed, 0 insertions, 0 deletions