diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-20 20:18:35 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-20 20:18:35 +0200 |
commit | a3d5c3460a86f52ea435b3fb98be112bd18faabc (patch) | |
tree | 48a32968b569af0e0f0af1def3effa0770710fea /kernel/time | |
parent | Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
parent | tracing/context-tracking: Add preempt_schedule_context() for tracing (diff) | |
download | linux-a3d5c3460a86f52ea435b3fb98be112bd18faabc.tar.xz linux-a3d5c3460a86f52ea435b3fb98be112bd18faabc.zip |
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixes from Ingo Molnar:
"Two smaller fixes - plus a context tracking tracing fix that is a bit
bigger"
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
tracing/context-tracking: Add preempt_schedule_context() for tracing
sched: Fix clear NOHZ_BALANCE_KICK
sched/x86: Construct all sibling maps if smt
Diffstat (limited to 'kernel/time')
0 files changed, 0 insertions, 0 deletions