]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'akpm-current/current'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 08:31:59 +0000 (19:31 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 09:06:56 +0000 (20:06 +1100)
commit6211a4820e544649cc870bc8091232eac1cc938a
tree7278dd4838070214e7853b2ae329e8c6ee3bdc2c
parent1a27facb2e4027b89ec3c4d7dac50a9d87d9bd67
parent28d6b6dd34438a8570f6165d6b07b90ad79ed8d2
Merge branch 'akpm-current/current'

Conflicts:
mm/memcontrol.c
mm/mlock.c
41 files changed:
Documentation/devicetree/bindings/vendor-prefixes.txt
Documentation/filesystems/proc.txt
Documentation/kernel-parameters.txt
MAINTAINERS
Makefile
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/include/asm/dma.h
arch/arm/kernel/setup.c
arch/ia64/Kconfig
arch/mips/Kconfig
arch/powerpc/Kconfig
arch/x86/Kconfig
arch/x86/kernel/setup.c
arch/x86/mm/init_32.c
block/blk-mq.c
block/blk-mq.h
drivers/block/loop.c
drivers/firmware/Kconfig
drivers/gpu/drm/drm_fb_helper.c
drivers/gpu/drm/nouveau/nouveau_acpi.c
drivers/input/input.c
drivers/misc/ti-st/st_core.c
drivers/rtc/Kconfig
drivers/rtc/Makefile
include/linux/blkdev.h
include/linux/kernel.h
include/linux/mm.h
include/linux/printk.h
include/linux/sched.h
kernel/fork.c
kernel/sched/core.c
kernel/sched/fair.c
kernel/sysctl.c
lib/Kconfig.debug
lib/Makefile
mm/hugetlb_cgroup.c
mm/memcontrol.c
mm/page_io.c
mm/slub.c
scripts/checkpatch.pl