diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-09 10:37:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-09 10:37:28 -0700 |
| commit | 17b2e9bf27d417bc186cc922b4d6d5eaa048f9d8 (patch) | |
| tree | 7ae99be289ec2ffe68aa38926d9e9a13e4387ee0 /MAINTAINERS | |
| parent | 422a253483aa5de71a2bcdc27b0aa023053f97f8 (diff) | |
| parent | e3c8ca8336707062f3f7cb1cd7e6b3c753baccdd (diff) | |
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: do not count frozen tasks toward load
sched: refresh MAINTAINERS entry
sched: Print sched_group::__cpu_power in sched_domain_debug
cpuacct: add per-cgroup utime/stime statistics
posixtimers, sched: Fix posix clock monotonicity
sched_rt: don't allocate cpumask in fastpath
cpuacct: make cpuacct hierarchy walk in cpuacct_charge() safe when rcupreempt is used -v2
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1f02d96a5db..5d843588e1d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3873,8 +3873,8 @@ S: Maintained SCHEDULER P: Ingo Molnar M: mingo@elte.hu -P: Robert Love [the preemptible kernel bits] -M: rml@tech9.net +P: Peter Zijlstra +M: peterz@infradead.org L: linux-kernel@vger.kernel.org S: Maintained |