]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 03:26:05 +0000 (13:26 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 03:26:05 +0000 (13:26 +1000)
commit5b908a2473a8c9de51de4bd2f40ee6728aa293b6
tree4f84c6ad59c5d90bd61c6d0567141ce25bfbf3ad
parentcdae8f8971b4270c87f7350f46d9ec3308baebe0
parent08162e6a23d476544adfe1164afe9ea8b34ab859
Merge remote-tracking branch 'security/next'

Conflicts:
include/linux/filter.h
MAINTAINERS
include/asm-generic/siginfo.h
include/linux/filter.h
kernel/fork.c
net/compat.c
net/core/filter.c
security/commoncap.c