]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'audit/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Apr 2014 03:16:25 +0000 (13:16 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Apr 2014 03:16:25 +0000 (13:16 +1000)
commitc992a1feaf73881bdef1b421eee8e192b77ce56c
tree549251086ce71114ce9360f5e153c71ff08d969c
parent1ec40491dcb912fe2567cf9cf51dfee2d9c8f562
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