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>
	Wed, 7 Nov 2012 01:30:17 +0000 (12:30 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 7 Nov 2012 01:30:17 +0000 (12:30 +1100)
commit	08b6faa1c89c8a685eddf0e840deb2828a9b1831
tree	74c113ce036ff99ac4ab49a9bbcf1673ecc6dc0d	tree \| snapshot
parent	d7263ec62e453db9bea732f70d35c4457eabde37	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