]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'akpm-current/current'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 May 2014 06:59:34 +0000 (16:59 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 May 2014 06:59:34 +0000 (16:59 +1000)
commit6f8127153cc88854bc13d1c4086f9b1a4d2b85b1
tree1d9aee2aa69e9e57e617eda1ba6bc15c28efa386
parentb96ba19767320e2b27ceb4e1976ec21f0ab54605
parente58827aca533b70b6e6ea7ae53f8b18e2b1a5e77
Merge branch 'akpm-current/current'

Conflicts:
mm/memcontrol.c
72 files changed:
Documentation/cgroups/memory.txt
Documentation/kernel-parameters.txt
Documentation/printk-formats.txt
MAINTAINERS
arch/arm/Kconfig
arch/arm64/Kconfig
arch/ia64/include/asm/topology.h
arch/powerpc/platforms/52xx/efika.c
arch/s390/Kconfig
arch/x86/Kconfig
arch/x86/mm/init_64.c
block/bio.c
block/bounce.c
drivers/base/Kconfig
drivers/base/dma-contiguous.c
drivers/leds/Kconfig
fs/9p/vfs_file.c
fs/affs/file.c
fs/block_dev.c
fs/btrfs/extent_io.c
fs/btrfs/file.c
fs/buffer.c
fs/ceph/addr.c
fs/cifs/smb2ops.c
fs/cifs/smb2pdu.c
fs/cifs/smb2pdu.h
fs/ext4/mballoc.c
fs/ext4/page-io.c
fs/f2fs/checkpoint.c
fs/f2fs/node.c
fs/fat/inode.c
fs/fuse/file.c
fs/gfs2/aops.c
fs/ntfs/file.c
fs/ocfs2/file.c
include/linux/blkdev.h
include/linux/buffer_head.h
include/linux/compiler.h
include/linux/fs.h
include/linux/memblock.h
include/linux/page-flags.h
include/linux/sched.h
include/linux/smp.h
include/linux/thread_info.h
include/linux/topology.h
init/Kconfig
init/main.c
kernel/acct.c
kernel/audit.c
kernel/cpuset.c
kernel/kmod.c
kernel/sched/core.c
kernel/sched/deadline.c
kernel/sched/rt.c
kernel/seccomp.c
kernel/smp.c
kernel/sysctl.c
lib/Kconfig
lib/Kconfig.debug
lib/Makefile
mm/Kconfig
mm/Makefile
mm/dmapool.c
mm/filemap.c
mm/huge_memory.c
mm/memblock.c
mm/memcontrol.c
mm/memory.c
mm/page-writeback.c
mm/page_io.c
mm/shmem.c
mm/vmscan.c