Merge tag 'samsung-defconfig-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git...

Merge "Defconfig (exynos and multi_v7) changes for Exynos based boards for v4.7" from Krzysztof Kozłowski:

1. Enable additional drivers for Trats2 board (Exynos4412).
2. Enable CPUFreq governors as modules.

* tag 'samsung-defconfig-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: multi_v7_defconfig: Enable CPUFreq governors as modules
  ARM: exynos_defconfig: Enable CPUFreq governors as modules
  ARM: exynos_defconfig: Enable Trats2 audio codec, touchscreen and sensors

diff --cc arch/arm/configs/multi_v7_defconfig
Simple merge