git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 9 Jan 2014 06:06:42 +0000 (17:06 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 9 Jan 2014 06:06:44 +0000 (17:06 +1100)
commit	8c1f750c9b18c3ce3c762f73cf50752222a961c4
tree	5043c81c9a5ba81e6ec20b027d2843c79ca8b2bc	tree \| snapshot
parent	e10713dedb695b2452a422e4b072ef20546fb429	commit \| diff
parent	28d6b6dd34438a8570f6165d6b07b90ad79ed8d2	commit \| diff

Merge branch 'akpm-current/current'

Conflicts:
arch/Kconfig
arch/x86/mm/numa.c
block/blk-mq-cpu.c
mm/memcontrol.c
mm/mlock.c

38 files changed:

Documentation/devicetree/bindings/vendor-prefixes.txt	diff1 \|	diff2 \|	blob \| history
Documentation/filesystems/proc.txt	diff1 \|	diff2 \|	blob \| history
Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/dma.h	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/ia64/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/mips/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/numa.c	diff1 \|	diff2 \|	blob \| history
drivers/block/loop.c	diff1 \|	diff2 \|	blob \| history
drivers/firmware/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_fb_helper.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_acpi.c	diff1 \|	diff2 \|	blob \| history
drivers/input/input.c	diff1 \|	diff2 \|	blob \| history
drivers/misc/ti-st/st_core.c	diff1 \|	diff2 \|	blob \| history
drivers/rtc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/rtc/Makefile	diff1 \|	diff2 \|	blob \| history
include/linux/blkdev.h	diff1 \|	diff2 \|	blob \| history
include/linux/kernel.h	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	diff1 \|	diff2 \|	blob \| history
include/linux/printk.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/fair.c	diff1 \|	diff2 \|	blob \| history
kernel/sysctl.c	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
lib/Makefile	diff1 \|	diff2 \|	blob \| history
lib/swiotlb.c	diff1 \|	diff2 \|	blob \| history
mm/hugetlb_cgroup.c	diff1 \|	diff2 \|	blob \| history
mm/memcontrol.c	diff1 \|	diff2 \|	blob \| history
mm/page_io.c	diff1 \|	diff2 \|	blob \| history
mm/slub.c	diff1 \|	diff2 \|	blob \| history
scripts/checkpatch.pl	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

RSS Atom

Documentation/devicetree/bindings/vendor-prefixes.txt	diff1 \|	diff2 \|	blob \| history
Documentation/filesystems/proc.txt	diff1 \|	diff2 \|	blob \| history
Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/dma.h	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/ia64/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/mips/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/numa.c	diff1 \|	diff2 \|	blob \| history
drivers/block/loop.c	diff1 \|	diff2 \|	blob \| history
drivers/firmware/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_fb_helper.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_acpi.c	diff1 \|	diff2 \|	blob \| history
drivers/input/input.c	diff1 \|	diff2 \|	blob \| history
drivers/misc/ti-st/st_core.c	diff1 \|	diff2 \|	blob \| history
drivers/rtc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/rtc/Makefile	diff1 \|	diff2 \|	blob \| history
include/linux/blkdev.h	diff1 \|	diff2 \|	blob \| history
include/linux/kernel.h	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	diff1 \|	diff2 \|	blob \| history
include/linux/printk.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/fair.c	diff1 \|	diff2 \|	blob \| history
kernel/sysctl.c	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
lib/Makefile	diff1 \|	diff2 \|	blob \| history
lib/swiotlb.c	diff1 \|	diff2 \|	blob \| history
mm/hugetlb_cgroup.c	diff1 \|	diff2 \|	blob \| history
mm/memcontrol.c	diff1 \|	diff2 \|	blob \| history
mm/page_io.c	diff1 \|	diff2 \|	blob \| history
mm/slub.c	diff1 \|	diff2 \|	blob \| history
scripts/checkpatch.pl	diff1 \|	diff2 \|	blob \| history