Merge tag 'stm32-defconfig-for-v4.13-1' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Mon, 19 Jun 2017 03:09:57 +0000 (20:09 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 19 Jun 2017 03:09:57 +0000 (20:09 -0700)
commit35a0a5545dabb203195a4fd8ad8f379b02fa0925
treeff871d6e8d9a4924da5a0063e7aa9070d3802da7
parentc186dbe463d860fee1ce5f6b77ffd2f95e1e4168
parentd81cd7d72f6441df759c3db7adc69f4ad8d54fc4
Merge tag 'stm32-defconfig-for-v4.13-1' of git://git./linux/kernel/git/atorgue/stm32 into next/defconfig

STM32 defconfig updates for v4.13, round 1

Highlights:
----------
 - Enable STMPE1600 IO expander
 - Enable Watchdog support

* tag 'stm32-defconfig-for-v4.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
  ARM: configs: stm32: STMPE1600 GPIO expander
  ARM: configs: stm32: Add watchdog support in STM32 defconfig

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