diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 14:46:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 14:46:05 -0700 |
| commit | 7fda0412c5f7afdd1a5ff518f98dee5157266d8a (patch) | |
| tree | d312af46758fa9b59431a479d258b54184a00591 /MAINTAINERS | |
| parent | Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| parent | cpusets: Remove an unused variable (diff) | |
| download | linux-dev-7fda0412c5f7afdd1a5ff518f98dee5157266d8a.tar.xz linux-dev-7fda0412c5f7afdd1a5ff518f98dee5157266d8a.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.
* '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 PERFORMANCE EVENTS SUBSYSTEM M: Peter Zijlstra <a.p.zijlstra@chello.nl> M: Paul Mackerras <paulus@samba.org> -M: Ingo Molnar <mingo@elte.hu> +M: Ingo Molnar <mingo@redhat.com> M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core S: Supported @@ -5833,7 +5833,7 @@ S: Maintained F: drivers/watchdog/sc1200wdt.c SCHEDULER -M: Ingo Molnar <mingo@elte.hu> +M: Ingo Molnar <mingo@redhat.com> M: Peter Zijlstra <peterz@infradead.org> T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core S: Maintained |