]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'audit/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 27 Jun 2014 02:03:56 +0000 (12:03 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 27 Jun 2014 02:03:56 +0000 (12:03 +1000)
commit361254ad2e6ff595c596aeb4bc88305e5900056e
tree72262c3ce23dd7e75da1cce239f0c654008bae69
parentfb63c1cd7c9ceb1c22f3daf2aa7c1e3030424146
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/entry_32.S
arch/x86/kernel/entry_64.S
arch/x86/kernel/ptrace.c
include/uapi/linux/audit.h
kernel/auditsc.c