diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 15:18:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 15:18:57 -0700 |
| commit | c82ffab9a857f8286ed2b559624b7005a367b638 (patch) | |
| tree | a5d0895a0b55c2db1bf36f517ca273e7e0abdf71 /kernel/hrtimer.c | |
| parent | Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 (diff) | |
| parent | SELinux: do not destroy the avc_cache_nodep (diff) | |
| download | linux-dev-c82ffab9a857f8286ed2b559624b7005a367b638.tar.xz linux-dev-c82ffab9a857f8286ed2b559624b7005a367b638.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
SELinux: do not destroy the avc_cache_nodep
KEYS: Have the garbage collector set its timer for live expired keys
tpm-fixup-pcrs-sysfs-file-update
creds_are_invalid() needs to be exported for use by modules:
include/linux/cred.h: fix build
Fix trivial BUILD_BUG_ON-induced conflicts in drivers/char/tpm/tpm.c
Diffstat (limited to 'kernel/hrtimer.c')
0 files changed, 0 insertions, 0 deletions