git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 13 Nov 2012 01:59:44 +0000 (12:59 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 13 Nov 2012 01:59:44 +0000 (12:59 +1100)
commit	2b0c349c2800f085d4f1f05f92c3751d3222ab02
tree	faad6322dd818be0721ec641c3c1e73ab975be19	tree \| snapshot
parent	c5f7a24461a03b2dbb55105355bf8e727d9b00e9	commit \| diff
parent	b5666502700855a1eb1a15482005b22478b9460e	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
fs/nfs/idmap.c	diff1 \|	diff2 \|	blob \| history
include/linux/key.h	diff1 \|	diff2 \|	blob \| history
kernel/cred.c	diff1 \|	diff2 \|	blob \| history
net/dns_resolver/dns_key.c	diff1 \|	diff2 \|	blob \| history
security/keys/key.c	diff1 \|	diff2 \|	blob \| history
security/keys/keyctl.c	diff1 \|	diff2 \|	blob \| history
security/keys/keyring.c	diff1 \|	diff2 \|	blob \| history
security/keys/process_keys.c	diff1 \|	diff2 \|	blob \| history
security/keys/request_key.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

RSS Atom

arch/x86/kernel/vsyscall_64.c	diff1 \|	diff2 \|	blob \| history
fs/nfs/idmap.c	diff1 \|	diff2 \|	blob \| history
include/linux/key.h	diff1 \|	diff2 \|	blob \| history
kernel/cred.c	diff1 \|	diff2 \|	blob \| history
net/dns_resolver/dns_key.c	diff1 \|	diff2 \|	blob \| history
security/keys/key.c	diff1 \|	diff2 \|	blob \| history
security/keys/keyctl.c	diff1 \|	diff2 \|	blob \| history
security/keys/keyring.c	diff1 \|	diff2 \|	blob \| history
security/keys/process_keys.c	diff1 \|	diff2 \|	blob \| history
security/keys/request_key.c	diff1 \|	diff2 \|	blob \| history