Merge branch 'linus' into sched/urgent

Conflicts:
	kernel/sched_idletask.c

Merge reason: resolve the conflicts, pick up latest changes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/sched_idletask.c
index b810e22,5f93b57..21b969a
--- 1/kernel/sched_idletask.c
--- 2/kernel/sched_idletask.c
+++ b/kernel/sched_idletask.c
@@@ -34,10 -34,10 +34,10 @@@ static struct task_struct *pick_next_ta
  static void
  dequeue_task_idle(struct rq *rq, struct task_struct *p, int sleep)
  {
-       spin_unlock_irq(&rq->lock);
+       raw_spin_unlock_irq(&rq->lock);
 -      printk(KERN_ERR "bad: scheduling from the idle thread!\n");
 +      pr_err("bad: scheduling from the idle thread!\n");
        dump_stack();
-       spin_lock_irq(&rq->lock);
+       raw_spin_lock_irq(&rq->lock);
  }
  
  static void put_prev_task_idle(struct rq *rq, struct task_struct *prev)