Merge branch 'linus' into timers/nohz

diff --cc arch/arm/kernel/process.c
Simple merge

diff --cc arch/mips/kernel/process.c
Simple merge

diff --cc arch/x86/kernel/process_32.c
index 1f5fa1c,0c3927a..53bc653
--- 1/arch/x86/kernel/process_32.c
--- 2/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@@ -166,9 -128,8 +128,8 @@@ void cpu_idle(void
  
        /* endless idle loop with no priority at all */
        while (1) {
 -              tick_nohz_stop_sched_tick();
 +              tick_nohz_stop_sched_tick(1);
                while (!need_resched()) {
-                       void (*idle)(void);
  
                        check_pgt_cache();
                        rmb();

diff --cc arch/x86/kernel/process_64.c
index c0a5c2a,a8e5362..9a10c18
--- 1/arch/x86/kernel/process_64.c
--- 2/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@@ -148,14 -120,11 +120,11 @@@ void cpu_idle(void
        current_thread_info()->status |= TS_POLLING;
        /* endless idle loop with no priority at all */
        while (1) {
 -              tick_nohz_stop_sched_tick();
 +              tick_nohz_stop_sched_tick(1);
                while (!need_resched()) {
-                       void (*idle)(void);
  
                        rmb();
-                       idle = pm_idle;
-                       if (!idle)
-                               idle = default_idle;
+ 
                        if (cpu_is_offline(smp_processor_id()))
                                play_dead();
                        /*

diff --cc kernel/softirq.c
Simple merge

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