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, 5 Dec 2012 01:56:13 +0000 (12:56 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 5 Dec 2012 01:56:13 +0000 (12:56 +1100)
commit	7823bbe23e310a56d1b5f97ff44261269c197945
tree	e73daeb47700109d67bf0713ae580a812f085b9e	tree \| snapshot
parent	47c52f0678d1ae8d22a8630cf86afdd92a6f0b22	commit \| diff
parent	c91c1bf2f53482c7d8111aa347abdcba148e5668	commit \| diff

Merge remote-tracking branch 'security/next'

Conflicts:
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/cifs/cifsacl.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/cifs/cifsacl.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