Merge branch 'v3.16-next/non-critical-fixes' into for-next

diff --cc arch/arm/mach-exynos/hotplug.c
index 69fa483973943a2ad6373e2c6f1c2e7063e1c802,03cdcd39f71c79a97b2e6eb76083966f7ed32873..8a134d019cb3af0ab7d792ae3ca177dd039df95d
--- 1/arch/arm/mach-exynos/hotplug.c
--- 2/arch/arm/mach-exynos/hotplug.c
+++ b/arch/arm/mach-exynos/hotplug.c
@@@ -44,15 -96,9 +44,9 @@@ static inline void platform_do_lowpower
  
                /* make cpu1 to be turned off at next WFI command */
                if (cpu == 1)
 -                      __raw_writel(0, S5P_ARM_CORE1_CONFIGURATION);
 +                      exynos_cpu_power_down(cpu);
  
-               /*
-                * here's the WFI
-                */
-               asm(".word      0xe320f003\n"
-                   :
-                   :
-                   : "memory", "cc");
+               wfi();
  
                if (pen_release == cpu_logical_map(cpu)) {
                        /*