Merge remote-tracking branch 'tip/core/rcu' into next.2012.09.25b

Resolved conflict in kernel/sched/core.c using Peter Zijlstra's
approach from https://lkml.org/lkml/2012/9/5/585.

diff --cc kernel/sched/core.c
index 8c38b5e7ce47f46fc7f7112d7f8d5390f69e8e3e,649c9f876cb164b0e16683479b59bf4d4f3b794b..1a48cdbc86314624696d9c9f554f588a938e65b8
--- 1/kernel/sched/core.c
--- 2/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@@ -5607,18 -5604,8 +5604,10 @@@ migration_call(struct notifier_block *n
                migrate_tasks(cpu);
                BUG_ON(rq->nr_running != 1); /* the migration thread */
                raw_spin_unlock_irqrestore(&rq->lock, flags);
 +              break;
  
-               {
-                       struct rq *dest_rq;
- 
-                       local_irq_save(flags);
-                       dest_rq = cpu_rq(smp_processor_id());
-                       raw_spin_lock(&dest_rq->lock);
-                       calc_load_migrate(rq);
-                       raw_spin_unlock_irqrestore(&dest_rq->lock, flags);
-               }
 +      case CPU_DEAD:
+               calc_load_migrate(rq);
                break;
  #endif
        }

diff --cc kernel/time/tick-sched.c
Simple merge