diff options
| author | 2014-07-22 21:54:43 +0100 | |
|---|---|---|
| committer | 2014-07-22 21:54:43 +0100 | |
| commit | 64724cfc6eea920dbaada14f0fb978b1dd31192d (patch) | |
| tree | d2f491be07a05e2d96b5c8b8e5a0a878f285eb22 /include/linux/timerqueue.h | |
| parent | Merge tag 'keys-pefile-20140709' into keys-next (diff) | |
| parent | ima: define '.ima' as a builtin 'trusted' keyring (diff) | |
Merge remote-tracking branch 'integrity/next-with-keys' into keys-next
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions
