| commit | 45ab6b0c76d0e4cce5bd608ccf97b0f6b20f18df | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri Dec 12 13:48:57 2008 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri Dec 12 13:48:57 2008 +0100 |
| tree | 4d51c73533c386aee16fde1e74b5e3bc22eedc53 | |
| parent | 81444a799550214f549caf579cf65a0ca55e70b7 [diff] | |
| parent | d65bd5ecb2bd166cea4952a59b7e16cc3ad6ef6c [diff] |
Merge branch 'sched/core' into cpus4096 Conflicts: include/linux/ftrace.h kernel/sched.c