diff options
| author | Linus Torvalds <[email protected]> | 2010-05-18 16:28:24 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2010-05-18 16:28:24 +0000 |
| commit | 3ae684e1c48e6deedc9b9faff8fa1c391ca8a652 (patch) | |
| tree | 07082b3239c24799e8aaf2e6a8a0ac059870d34a /scripts/mod/file2alias.c | |
| parent | Merge branch 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | x86, tboot: Add support for S3 memory integrity protection (diff) | |
| download | kernel-3ae684e1c48e6deedc9b9faff8fa1c391ca8a652.tar.gz kernel-3ae684e1c48e6deedc9b9faff8fa1c391ca8a652.zip | |
Merge branch 'x86-txt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-txt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, tboot: Add support for S3 memory integrity protection
Diffstat (limited to 'scripts/mod/file2alias.c')
0 files changed, 0 insertions, 0 deletions