tree c05d5d6ca3f625d72a9d136b4c485d3dc9472089
parent be1e4e760d940c14d119bffef5eb007dfdf29046
parent 5cb480f6b488128140c940abff3c36f524a334a8
author Ingo Molnar <mingo@kernel.org> 1391330739 +0100
committer Ingo Molnar <mingo@kernel.org> 1391330739 +0100

Merge branch 'linus' into sched/core, to resolve conflicts

Conflicts:
	kernel/sysctl.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>