Merge branch 'keys-fixes' into keys-next
authorDavid Howells <dhowells@redhat.com>
Tue, 22 Jul 2014 20:55:45 +0000 (21:55 +0100)
committerDavid Howells <dhowells@redhat.com>
Tue, 22 Jul 2014 20:55:45 +0000 (21:55 +0100)
commit633706a2ee81637be37b6bc02c5336950cc163b5
tree5dad64c393d3b12276b35c5835c40c6d78f606a2
parent64724cfc6eea920dbaada14f0fb978b1dd31192d
parent0d1f64f60b4c50a8c604010ad3eef5cdfe9926bc
Merge branch 'keys-fixes' into keys-next

Signed-off-by: David Howells <dhowells@redhat.com>
crypto/asymmetric_keys/Kconfig
fs/nfs/idmap.c
include/linux/key.h
security/keys/keyctl.c