]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 30 Oct 2012 01:58:35 +0000 (12:58 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 30 Oct 2012 01:58:35 +0000 (12:58 +1100)
commit8ce162fe1b731f327035edd75db200a302b7eb77
tree5a9e9801aa36f43aed14647c1293e692d88bc2cc
parent172ed0358f236e4e90ade7985fd765a124d6c19f
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