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