Merge remote branch 'origin/android-tegra-nv-3.4' into tot
Bo Yan [Mon, 9 Jul 2012 21:11:09 +0000 (14:11 -0700)]
Conflicts:
arch/arm/mach-imx/hotplug.c

Change-Id: I33c5f2e4c2d556c09173be3c5fd36bf59f7c9ca8

1  2 
Makefile
arch/arm/mach-imx/hotplug.c
arch/arm/vfp/vfpmodule.c

diff --cc Makefile
Simple merge
@@@ -19,11 -63,12 +63,12 @@@ static inline void cpu_leave_lowpower(v
   *
   * Called with IRQs disabled
   */
 -void platform_cpu_die(unsigned int cpu)
 +void imx_cpu_die(unsigned int cpu)
  {
-       flush_cache_all();
+       cpu_enter_lowpower();
        imx_enable_cpu(cpu, false);
        cpu_do_idle();
+       cpu_leave_lowpower();
  
        /* We should never return from idle */
        panic("cpu %d unexpectedly exit from shutdown\n", cpu);
Simple merge