]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'audit/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 May 2014 03:42:26 +0000 (13:42 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 May 2014 03:42:26 +0000 (13:42 +1000)
commitbe1671f25deb2b485a35e27880e8f8f57a76fbae
tree9c1d68b384c3bc9c018f6a139a66427d03389a1a
parentcfa3f5c4e0c3a43f94818579fba10a9638b5750b
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