]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 29 Oct 2012 01:19:21 +0000 (12:19 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 29 Oct 2012 01:19:21 +0000 (12:19 +1100)
commit28c616b5b07f2e716e7ed2cb668df68060e4f2d2
tree95dd568ccd8c64a19991f1871123abe6811295eb
parentcee25ad052586481117eadcb86dbda103c891b0b
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