Merge tag 'keys-20140314' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells...
authorJames Morris <james.l.morris@oracle.com>
Mon, 14 Apr 2014 01:42:49 +0000 (11:42 +1000)
committerJames Morris <james.l.morris@oracle.com>
Mon, 14 Apr 2014 01:42:49 +0000 (11:42 +1000)
commitb13cebe70775e67323e1c2eff20e1cd174e430a4
tree80e5775c2ce5c90bdef8a2ce487fb70a179217af
parentecd740c6f2f092b90b95fa35f757973589eaaca2
parentfffea214abf66a8672cfd6697fae65e743e22f11
Merge tag 'keys-20140314' of git://git./linux/kernel/git/dhowells/linux-fs into next
include/linux/security.h
security/capability.c
security/security.c
security/selinux/hooks.c