Merge tag 'sti-defconfig-for-v4.2-1' of...

Merge tag 'sti-defconfig-for-v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti into next/defconfig

Merge "STi defconfig for v4.2, round 1" from Maxime Coquelin:

Highlights:
-----------
 - Enable ST's LPC Watchdog driver
 - Enable ST's LPC RTC driver

* tag 'sti-defconfig-for-v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti:
  ARM: multi_v7_defconfig: Enable support for ST's LPC RTC
  ARM: multi_v7_defconfig: Enable support for ST's LPC Watchdog

arch/arm/configs/multi_v7_defconfig

@@ -341,6 +341,7 @@ CONFIG_WATCHDOG=y
 CONFIG_XILINX_WATCHDOG=y
 CONFIG_ARM_SP805_WATCHDOG=y
 CONFIG_ORION_WATCHDOG=y
+CONFIG_ST_LPC_WATCHDOG=y
 CONFIG_SUNXI_WATCHDOG=y
 CONFIG_MESON_WATCHDOG=y
 CONFIG_MFD_AS3711=y
@@ -506,6 +507,7 @@ CONFIG_RTC_DRV_MAX8907=y
 CONFIG_RTC_DRV_MAX77686=y
 CONFIG_RTC_DRV_RS5C372=m
 CONFIG_RTC_DRV_PALMAS=y
+CONFIG_RTC_DRV_ST_LPC=y
 CONFIG_RTC_DRV_TWL4030=y
 CONFIG_RTC_DRV_TPS6586X=y
 CONFIG_RTC_DRV_TPS65910=y