Merge branch 'modsign-keys-devel' into security-next-keys
authorDavid Howells <dhowells@redhat.com>
Tue, 2 Oct 2012 18:30:19 +0000 (19:30 +0100)
committerDavid Howells <dhowells@redhat.com>
Tue, 2 Oct 2012 18:30:19 +0000 (19:30 +0100)
commit4442d7704c7311d1c42383d365e0b883e0075975
treeee80c095ea8b13c2ad62c9406ddc6166c5b09cb4
parentf8aa23a55f813c9bddec2a6176e0e67274e6e7c1
parentd4f65b5d2497b2fd9c45f06b71deb4ab084a5b66
Merge branch 'modsign-keys-devel' into security-next-keys

Signed-off-by: David Howells <dhowells@redhat.com>
Documentation/security/keys.txt
fs/cifs/cifsacl.c
net/dns_resolver/dns_key.c
security/keys/key.c
security/keys/keyctl.c
security/keys/keyring.c
security/keys/trusted.c