]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge tag 'v3.14' into mergeing
authorEric Paris <eparis@redhat.com>
Tue, 15 Apr 2014 16:45:52 +0000 (12:45 -0400)
committerEric Paris <eparis@redhat.com>
Tue, 15 Apr 2014 16:46:20 +0000 (12:46 -0400)
commit596b0569084bb54f572b6945585629c3120f4f0e
treee4f369725f05b2420ca7905a52762be4e583b8a0
parent312103d64d0fcadb332899a2c84b357ddb18f4e3
parent455c6fdbd219161bd09b1165f11699d6d73de11c
Merge tag 'v3.14' into mergeing

Linux 3.14

Conflicts:
arch/mips/include/asm/syscall.h
arch/powerpc/Kconfig
arch/x86/Kconfig
init/Kconfig
kernel/audit.c
20 files changed:
arch/alpha/Kconfig
arch/arm/Kconfig
arch/ia64/Kconfig
arch/mips/include/asm/syscall.h
arch/mips/kernel/ptrace.c
arch/parisc/Kconfig
arch/powerpc/Kconfig
arch/s390/Kconfig
arch/sh/Kconfig
arch/sparc/Kconfig
arch/x86/Kconfig
fs/proc/base.c
include/linux/mm.h
include/linux/sched.h
init/Kconfig
kernel/audit.c
kernel/auditfilter.c
kernel/auditsc.c
lib/Makefile
mm/util.c