]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'audit/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 May 2014 03:54:45 +0000 (13:54 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 May 2014 03:54:45 +0000 (13:54 +1000)
commit90abcb5800c42da430752f37b84ce598edc3ff15
tree5cb321365fc46d36afbe3bb967fc6d8d60026284
parent1c81c698da188f1bd319e0ad05783adc5c10f97d
parent35d0c383e526031145db7643618d9a529454a32f
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