]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Oct 2012 02:20:39 +0000 (13:20 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Oct 2012 02:20:39 +0000 (13:20 +1100)
commit7116da76b279f76e91b043bb290f638cd1b08853
tree4907ec91932e40a3676c2c91cadc2d43a5eb94a3
parent9c041558848b21b3f2d3025221c2b036fe344913
parent61d335dd27c67d656f114c091a46cf95cbeeb77c
Merge remote-tracking branch 'security/next'

Conflicts:
fs/cifs/cifsacl.c
net/dns_resolver/dns_key.c
security/keys/keyctl.c
security/keys/keyring.c
security/keys/process_keys.c
arch/x86/kernel/vsyscall_64.c
fs/cifs/cifsacl.c
fs/nfs/idmap.c
include/linux/key.h
kernel/cred.c
net/dns_resolver/dns_key.c
security/keys/key.c
security/keys/keyctl.c
security/keys/keyring.c
security/keys/process_keys.c
security/keys/request_key.c