tree 4d51c73533c386aee16fde1e74b5e3bc22eedc53
parent 81444a799550214f549caf579cf65a0ca55e70b7
parent d65bd5ecb2bd166cea4952a59b7e16cc3ad6ef6c
author Ingo Molnar <mingo@elte.hu> 1229086137 +0100
committer Ingo Molnar <mingo@elte.hu> 1229086137 +0100

Merge branch 'sched/core' into cpus4096

Conflicts:
	include/linux/ftrace.h
	kernel/sched.c