]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Merge branch 'for-4.9' into for-4.10
authorTejun Heo <tj@kernel.org>
Wed, 19 Oct 2016 16:12:40 +0000 (12:12 -0400)
committerTejun Heo <tj@kernel.org>
Wed, 19 Oct 2016 16:12:40 +0000 (12:12 -0400)
1  2 
arch/x86/kernel/cpu/mcheck/mce.c
drivers/tty/vt/vt.c
include/linux/workqueue.h
init/main.c
kernel/workqueue.c
mm/slab.c

Simple merge
Simple merge
Simple merge
diff --cc init/main.c
Simple merge
Simple merge
diff --cc mm/slab.c
Simple merge