| commit | 4eb867651721228ee2eeae142c53378375303e8b | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Thu May 12 09:51:36 2016 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Thu May 12 09:51:36 2016 +0200 |
| tree | 43ebd9894ff53a7b2d0244293f226cbbfc80d882 | |
| parent | eb60b3e5e8dfdd590e586a6fc22daf2f63a7b7e6 [diff] | |
| parent | e5ef27d0f5acf9f1db2882d7546a41c021f66820 [diff] |
Merge branch 'smp/hotplug' into sched/core, to resolve conflicts Conflicts: kernel/sched/core.c Signed-off-by: Ingo Molnar <mingo@kernel.org>