Merge tag 'v3.16' into next

Linux 3.16
This commit is contained in:
Paul Moore
2014-08-05 15:44:22 -04:00
9755 changed files with 496104 additions and 249563 deletions

View File

@@ -5736,7 +5736,7 @@ static void selinux_key_free(struct key *k)
static int selinux_key_permission(key_ref_t key_ref,
const struct cred *cred,
key_perm_t perm)
unsigned perm)
{
struct key *key;
struct key_security_struct *ksec;