Merge branch 'v3.12-next/mach-exynos' into for-next

Conflicts:
	arch/arm/mach-exynos/Kconfig

diff --cc arch/arm/mach-exynos/Kconfig
index 5952e68c76c40e622e828a9e1849542b69f12aad,cf8e889bff89bb727fdb468c20a4935bb35dc844..5c9ab97617bd1e49c882aec3b44d32ce1b58d305
--- 1/arch/arm/mach-exynos/Kconfig
--- 2/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@@ -92,10 -96,10 +96,11 @@@ config SOC_EXYNOS544
        bool "SAMSUNG EXYNOS5440"
        default y
        depends on ARCH_EXYNOS5
 +      select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
+       select ARCH_HAS_BANDGAP
        select ARCH_HAS_OPP
--      select HAVE_ARM_ARCH_TIMER
        select AUTO_ZRELADDR
++      select HAVE_ARM_ARCH_TIMER
        select MIGHT_HAVE_PCI
        select PCI_DOMAINS if PCI
        select PINCTRL_EXYNOS5440