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

Two fixes for v4.7 cycle for build issues:
1. Fix samsung-keypad build error if INPUT is selected as module.
   The error though depends on some uncommon build settings so it
   is not as easy to trigger.

2. Get rid of 'samsung_device_dma_mask' defined but not used warning.

* tag 'samsung-fixes-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: exynos: don't select keyboard driver
  ARM: samsung: improve static dma_mask definition

Signed-off-by: Olof Johansson <olof@lixom.net>

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

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

diff --cc arch/arm/mach-exynos/Kconfig
Simple merge