Merge branch 'sched/core'

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc Documentation/sysctl/kernel.txt
Simple merge