Merge tag 'fixes-for-linus' of git://

Pull ARM SoC fixes from Olof Johansson:
 "Only one remaining fix for arm-soc platforms at this time, a small
  bugfix for cpu hotplug on highbank platforms that has become much
  easier to hit as of late.

  Details in the patch description, but it's small and well-contained
  and definitely impacts users of the platform, so 3.9 seems

* tag 'fixes-for-linus' of git://
  ARM: highbank: fix cache flush ordering for cpu hotplug
diff --git a/arch/arm/mach-highbank/hotplug.c b/arch/arm/mach-highbank/hotplug.c
index f30c528..890cae2 100644
--- a/arch/arm/mach-highbank/hotplug.c
+++ b/arch/arm/mach-highbank/hotplug.c
@@ -28,13 +28,11 @@
 void __ref highbank_cpu_die(unsigned int cpu)
-	flush_cache_all();
 	highbank_set_cpu_jump(cpu, phys_to_virt(0));
+	flush_cache_louis();
-	cpu_do_idle();
-	/* We should never return from idle */
-	panic("highbank: cpu %d unexpectedly exit from shutdown\n", cpu);
+	while (1)
+		cpu_do_idle();