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

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

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 05a1707 6e7ebeb)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 10 Dec 2013 03:27:12 +0000 (14:27 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 10 Dec 2013 03:27:12 +0000 (14:27 +1100)
commit	714c128e9f60be067ee383c5a33a21b1555964bc
tree	1aade2a8fedf39c9acf8ee62e92d379a29a4fa45	tree \| snapshot
parent	05a1707c913a1a647349c31dcbd70fc343169c22	commit \| diff
parent	6e7ebeb1cb496d0f4dd5800d952b9c305878aae9	commit \| diff

Merge branch 'akpm-current/current'

Conflicts:
arch/um/kernel/sysrq.c
kernel/params.c

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
block/blk-mq.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_acpi.c	diff1 \|	diff2 \|	blob \| history
drivers/misc/ti-st/st_core.c	diff1 \|	diff2 \|	blob \| history
include/linux/blkdev.h	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
kernel/kexec.c	diff1 \|	diff2 \|	blob \| history
mm/memcontrol.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules