Merge tag 'sti-defconfig-for-v3.17-1' of git://git.stlinux.com/devel/kernel/linux...

Merge "ARM: STi: defconfig changes for v3.17" from Maxime Coquelin:

STi defconfig updates for v3.17

 - Enable ST's Thermal controller driver
 - Enable ST's Keyscan driver
 - Enable ST's MiPHY365 Phy driver for STiH416 SATA & PCIe
 - Enable ST's AHCI driver.

* tag 'sti-defconfig-for-v3.17-1' of git://git.stlinux.com/devel/kernel/linux-sti:
  ARM: multi_v7_defconfig: Enable MiPHY365x - ST's Generic (SATA & PCIe) PHY
  ARM: multi_v7_defconfig: Enable ST's (S)ATA driver
  ARM: multi_v7_defconfig: add ST Keyscan driver
  ARM: update multi_v7_defconfig for STI
  ARM: multi_v7_defconfig: Configure in ST's Thermal Controller
  + Linux 3.16-rc6

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

diff --cc arch/arm/configs/multi_v7_defconfig
index d52b07b,870ece2..a62ca27
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -156,10 -156,9 +157,11 @@@ CONFIG_INPUT_EVDEV=
  CONFIG_KEYBOARD_GPIO=y
  CONFIG_KEYBOARD_TEGRA=y
  CONFIG_KEYBOARD_SPEAR=y
+ CONFIG_KEYBOARD_ST_KEYSCAN=y
  CONFIG_KEYBOARD_CROS_EC=y
  CONFIG_MOUSE_PS2_ELANTECH=y
 +CONFIG_INPUT_TOUCHSCREEN=y
 +CONFIG_TOUCHSCREEN_STMPE=y
  CONFIG_INPUT_MISC=y
  CONFIG_INPUT_MPU3050=y
  CONFIG_SERIO_AMBAKMI=y
@@@ -226,10 -224,10 +228,11 @@@ CONFIG_POWER_RESET_AS3722=
  CONFIG_POWER_RESET_GPIO=y
  CONFIG_POWER_RESET_SUN6I=y
  CONFIG_SENSORS_LM90=y
 +CONFIG_SENSORS_LM95245=y
  CONFIG_THERMAL=y
- CONFIG_DOVE_THERMAL=y
  CONFIG_ARMADA_THERMAL=y
+ CONFIG_ST_THERMAL_SYSCFG=y
+ CONFIG_ST_THERMAL_MEMMAP=y
  CONFIG_WATCHDOG=y
  CONFIG_ORION_WATCHDOG=y
  CONFIG_SUNXI_WATCHDOG=y