commit | cefef3a76287c9b51e946d312aea1637bb3a57ff | [log] [tgz] |
---|---|---|
author | Ingo Molnar <mingo@kernel.org> | Thu Jul 14 10:37:48 2016 +0200 |
committer | Ingo Molnar <mingo@kernel.org> | Thu Jul 14 10:37:48 2016 +0200 |
tree | acc1ee1a6a530803951e3c0a0ca65c08a567f563 | |
parent | 92d21ac74a9e3c09b0b01c764e530657e4c85c49 [diff] | |
parent | 748c7201e622d1c24abb4f85072d2e74d12f295f [diff] |
Merge branch 'sched/core' into timers/nohz, to avoid conflicts in upcoming patches Signed-off-by: Ingo Molnar <mingo@kernel.org>