Merge branch 'for-3.8/cpuidle' into for-next

diff --cc arch/arm/mach-tegra/common.c
index 3e03e5f15c146cbbe96134fa549724c21a648672,c25746eedee5069c3309206e0bd071d6140fad1e..11a74db51e5d4f0972e9b8ad093da3fb5844aa70
--- 1/arch/arm/mach-tegra/common.c
--- 2/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@@ -121,9 -124,11 +124,11 @@@ static void __init tegra_init_cache(voi
  
        cache_type = readl(p + L2X0_CACHE_TYPE);
        aux_ctrl = (cache_type & 0x700) << (17-8);
 -      aux_ctrl |= 0x6C000001;
 +      aux_ctrl |= 0x7C400001;
  
-       l2x0_of_init(aux_ctrl, 0x8200c3fe);
+       ret = l2x0_of_init(aux_ctrl, 0x8200c3fe);
+       if (!ret)
+               l2x0_saved_regs_addr = virt_to_phys(&l2x0_saved_regs);
  #endif
  
  }