diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 17:46:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 17:46:05 -0400 |
commit | 7fda0412c5f7afdd1a5ff518f98dee5157266d8a (patch) | |
tree | d312af46758fa9b59431a479d258b54184a00591 /MAINTAINERS | |
parent | 6b8212a313dae341ef3a2e413dfec5c4dea59617 (diff) | |
parent | 160594e99dbbb0a5600ad922c630952c7c1c14bf (diff) |
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixes from Ingo Molnar.
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
cpusets: Remove an unused variable
sched/rt: Improve pick_next_highest_task_rt()
sched: Fix select_fallback_rq() vs cpu_active/cpu_online
sched/x86/smp: Do not enable IRQs over calibrate_delay()
sched: Fix compiler warning about declared inline after use
MAINTAINERS: Update email address for SCHEDULER and PERF EVENTS
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f9faadef7ab7..64168f6dd89e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -5185,7 +5185,7 @@ F: kernel/delayacct.c | |||
5185 | PERFORMANCE EVENTS SUBSYSTEM | 5185 | PERFORMANCE EVENTS SUBSYSTEM |
5186 | M: Peter Zijlstra <a.p.zijlstra@chello.nl> | 5186 | M: Peter Zijlstra <a.p.zijlstra@chello.nl> |
5187 | M: Paul Mackerras <paulus@samba.org> | 5187 | M: Paul Mackerras <paulus@samba.org> |
5188 | M: Ingo Molnar <mingo@elte.hu> | 5188 | M: Ingo Molnar <mingo@redhat.com> |
5189 | M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> | 5189 | M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> |
5190 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core | 5190 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core |
5191 | S: Supported | 5191 | S: Supported |
@@ -5833,7 +5833,7 @@ S: Maintained | |||
5833 | F: drivers/watchdog/sc1200wdt.c | 5833 | F: drivers/watchdog/sc1200wdt.c |
5834 | 5834 | ||
5835 | SCHEDULER | 5835 | SCHEDULER |
5836 | M: Ingo Molnar <mingo@elte.hu> | 5836 | M: Ingo Molnar <mingo@redhat.com> |
5837 | M: Peter Zijlstra <peterz@infradead.org> | 5837 | M: Peter Zijlstra <peterz@infradead.org> |
5838 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core | 5838 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core |
5839 | S: Maintained | 5839 | S: Maintained |