Commits

Merge branch 'linus' into sched/core, to resolve conflicts Conflicts: kernel/sysctl.c Signed-off-by: Ingo Molnar <mingo@kernel.org>
Merge branch 'linus' into sched/core, to resolve conflicts Conflicts: kernel/sysctl.c Signed-off-by: Ingo Molnar <mingo@kernel.org>