]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'akpm-current/current'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 2 Aug 2013 07:28:41 +0000 (17:28 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 2 Aug 2013 07:28:41 +0000 (17:28 +1000)
commite39f33535cc358c9d7feb96000da1f39a9803df6
tree668ab4a5c6b6ee7032a6b3a1036a1b22a097017a
parentb3705a4645b32bd6dbb1eb2da89b58bf17cacc30
parent36313f80580549c66d185f0548df24cfe043bbb8
Merge branch 'akpm-current/current'

Conflicts:
fs/binfmt_elf.c
20 files changed:
MAINTAINERS
arch/s390/Kconfig
drivers/isdn/mISDN/core.c
fs/binfmt_aout.c
fs/binfmt_elf.c
fs/binfmt_elf_fdpic.c
fs/ocfs2/cluster/heartbeat.c
fs/ocfs2/dlm/dlmmaster.c
fs/ocfs2/dlm/dlmrecovery.c
fs/ocfs2/file.c
include/linux/binfmts.h
include/linux/mm.h
include/linux/sched.h
init/do_mounts.c
kernel/fork.c
kernel/smp.c
kernel/watchdog.c
lib/Kconfig.debug
mm/slub.c
net/socket.c