Merge remote-tracking branch 'kspp/for-next/kspp'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2016 00:50:13 +0000 (10:50 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2016 00:50:13 +0000 (10:50 +1000)
12 files changed:
1  2 
Documentation/kernel-parameters.txt
arch/Kconfig
arch/powerpc/kernel/Makefile
fs/namespace.c
include/linux/compiler-gcc.h
include/linux/compiler.h
include/linux/init.h
kernel/fork.c
kernel/sched/fair.c
kernel/time/timer.c
mm/page_alloc.c
net/core/dev.c

Simple merge
diff --cc arch/Kconfig
Simple merge
Simple merge
diff --cc fs/namespace.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/fork.c
Simple merge
Simple merge
Simple merge
diff --cc mm/page_alloc.c
Simple merge
diff --cc net/core/dev.c
Simple merge
This page took 0.042772 seconds and 5 git commands to generate.