Merge remote-tracking branch 'lsk/v3.10/topic/big.LITTLE' into linux-linaro-lsk

diff --cc arch/arm/Kconfig
Simple merge

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

diff --cc drivers/irqchip/irq-gic.c
index 6f00dfa7d4fd356bc7b1b19e547d990da360a489,5dc511c587222c0f537cf33d4a28c999b680c8bb..65bc83747f6664a3c37c6bb8c109d2ed2de93df6
--- 1/drivers/irqchip/irq-gic.c
--- 2/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@@ -651,13 -647,13 +652,15 @@@ static void __init gic_pm_init(struct g
  void gic_raise_softirq(const struct cpumask *mask, unsigned int irq)
  {
        int cpu;
 -      unsigned long map = 0;
 +      unsigned long flags, map = 0;
 +
 +      raw_spin_lock_irqsave(&irq_controller_lock, flags);
  
        /* Convert our logical CPU mask into a physical one. */
-       for_each_cpu(cpu, mask)
+       for_each_cpu(cpu, mask) {
+               trace_arm_ipi_send(irq, cpu);
                map |= gic_cpu_map[cpu];
+       }
  
        /*
         * Ensure that stores to Normal memory are visible to the

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