Merge remote-tracking branch 'stable/linux-3.10.y' into linux-linaro-lsk

Conflicts:
	arch/arm64/kernel/smp.c

Signed-off-by: Alex Shi <alex.shi@linaro.org>

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/arm/include/asm/arch_timer.h
Simple merge

diff --cc arch/arm64/kernel/smp.c
index 5e9d27442fbb03204d2482727cd9bbc50fd4a3c9,9c93e126328cfaa04ffdaa8612a43e4d9d09a6aa..87340fd539398176f83604483e678053f38bb350
--- 1/arch/arm64/kernel/smp.c
--- 2/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@@ -150,17 -187,17 +150,10 @@@ asmlinkage void __cpuinit secondary_sta
        preempt_disable();
        trace_hardirqs_off();
  
 -      /*
 -       * Let the primary processor know we're out of the
 -       * pen, then head off into the C entry point
 -       */
 -      write_pen_release(INVALID_HWID);
 +      if (cpu_ops[cpu]->cpu_postboot)
 +              cpu_ops[cpu]->cpu_postboot();
  
--      /*
-        * Enable local interrupts.
 -       * Synchronise with the boot thread.
--       */
-       notify_cpu_starting(cpu);
-       local_irq_enable();
-       local_fiq_enable();
- 
 -      raw_spin_lock(&boot_lock);
 -      raw_spin_unlock(&boot_lock);
 +      smp_store_cpu_info(cpu);
  
        /*
         * OK, now it's safe to let the boot CPU continue.  Wait for

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/sched/fair.c
Simple merge