]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'audit/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 03:57:42 +0000 (13:57 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 03:57:42 +0000 (13:57 +1000)
commitd232c030b635280fbc13e4890a754abb6fa05005
treeb52286438ecc82b0428ef3a16a4dcb1ca5824550
parentc7611eb0e03dc7f8b6ba5789fcb7b06064f3d996
parent3efe33f5d2da8bb38f4ca93d12ae4f69fedde32a
Merge remote-tracking branch 'audit/master'

Conflicts:
arch/mips/include/asm/syscall.h
arch/mips/kernel/ptrace.c
arch/x86/Kconfig
kernel/audit.c
arch/mips/include/asm/syscall.h
arch/mips/kernel/ptrace.c
arch/s390/kernel/ptrace.c
arch/um/kernel/ptrace.c
arch/x86/kernel/ptrace.c
include/uapi/linux/audit.h