From: Olof Johansson Date: Fri, 3 Apr 2015 21:57:51 +0000 (-0700) Subject: Merge tag 'samsung-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene... X-Git-Tag: v4.1-rc1~47^2~1 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=d66e8d2e3c03bd380f23b29699d1991b1f064f22;p=linux.git Merge tag 'samsung-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/defconfig Merge "Samsung defconfig updates for v4.1" from Kukjin Kim: - update exynos-defconfig : enable HDMI, CPUidle, ChromeOS EC chardev driver and thermal emulation, Marvell WiFi-Ex, CPUfreq, and support for NFS rootfs : remove EXYNOS_THERMAL_CORE define and disable IOMMU support until support it * tag 'samsung-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: exynos_defconfig: Enable HDMI support ARM: exynos_defconfig: Enable options to mount a rootfs via NFS ARM: exynos_defconfig: Enable ChromeOS EC chardev driver ARM: exynos_defconfig: Enable CPU idle ARM: exynos_defconfig: Enable Marvell WiFi-Ex support ARM: exynos_defconfig: Disable IOMMU support ARM: exynos_defconfig: Enable support for cpufreq on Exynos SoCs ARM: exynos_defconfig: Enable thermal emulation for Exynos TMU ARM: exynos_defconfig: Remove CONFIG_EXYNOS_THERMAL_CORE define Signed-off-by: Olof Johansson --- d66e8d2e3c03bd380f23b29699d1991b1f064f22