Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

* '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

diff --combined MAINTAINERS
index 1f02d96a5dbf436d295c33f837f21ea83c5cec16,718b50ac7ea172820353648bde9c8255f2f7b4cd..5d843588e1de159958693aee543af4af2e82c6dc
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -636,7 -636,7 +636,7 @@@ P: Dirk Opfe
  M:    [email protected]
  S:    Maintained
  
 -ARM/PALMTX,PALMT5,PALMLD SUPPORT
 +ARM/PALMTX,PALMT5,PALMLD,PALMTE2 SUPPORT
  P:    Marek Vasut
  M:    [email protected]
  W:    http://hackndev.com
@@@ -3057,7 -3057,7 +3057,7 @@@ S:      Supporte
  
  MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
  P:    Pierre Ossman
 -M:    [email protected]
 +M:    [email protected]
  L:    [email protected]
  S:    Maintained
  
@@@ -3873,8 -3873,8 +3873,8 @@@ S:      Maintaine
  SCHEDULER
  P:    Ingo Molnar
  M:    [email protected]
- P:    Robert Love    [the preemptible kernel bits]
- M:    [email protected]
+ P:    Peter Zijlstra
+ M:    [email protected]
  L:    [email protected]
  S:    Maintained
  
@@@ -3939,7 -3939,7 +3939,7 @@@ S:      Maintaine
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
  P:    Pierre Ossman
 -M:    [email protected]
 +M:    [email protected]
  L:    [email protected]
  S:    Maintained
  
@@@ -4926,7 -4926,7 +4926,7 @@@ S:      Maintaine
  
  W83L51xD SD/MMC CARD INTERFACE DRIVER
  P:    Pierre Ossman
 -M:    [email protected]
 +M:    [email protected]
  L:    [email protected]
  S:    Maintained
  

diff --combined kernel/posix-cpu-timers.c
index bb53185d8c786800a185ae8c7192269e22ecda52,6f7b869c011d8e4f817eb1d01e548c2def5c14a5..c9dcf98b44633398217e3a7829ace3bf7791403d
--- 1/kernel/posix-cpu-timers.c
--- 2/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
@@@ -18,7 -18,7 +18,7 @@@ void update_rlimit_cpu(unsigned long rl
  
        cputime = secs_to_cputime(rlim_new);
        if (cputime_eq(current->signal->it_prof_expires, cputime_zero) ||
 -          cputime_lt(current->signal->it_prof_expires, cputime)) {
 +          cputime_gt(current->signal->it_prof_expires, cputime)) {
                spin_lock_irq(&current->sighand->siglock);
                set_process_cpu_timer(current, CPUCLOCK_PROF, &cputime, NULL);
                spin_unlock_irq(&current->sighand->siglock);
@@@ -224,7 -224,7 +224,7 @@@ static int cpu_clock_sample(const clock
                cpu->cpu = virt_ticks(p);
                break;
        case CPUCLOCK_SCHED:
-               cpu->sched = p->se.sum_exec_runtime + task_delta_exec(p);
+               cpu->sched = task_sched_runtime(p);
                break;
        }
        return 0;
@@@ -305,18 -305,19 +305,19 @@@ static int cpu_clock_sample_group(cons
  {
        struct task_cputime cputime;
  
-       thread_group_cputime(p, &cputime);
        switch (CPUCLOCK_WHICH(which_clock)) {
        default:
                return -EINVAL;
        case CPUCLOCK_PROF:
+               thread_group_cputime(p, &cputime);
                cpu->cpu = cputime_add(cputime.utime, cputime.stime);
                break;
        case CPUCLOCK_VIRT:
+               thread_group_cputime(p, &cputime);
                cpu->cpu = cputime.utime;
                break;
        case CPUCLOCK_SCHED:
-               cpu->sched = cputime.sum_exec_runtime + task_delta_exec(p);
+               cpu->sched = thread_group_sched_runtime(p);
                break;
        }
        return 0;