Merge tag 'omap-for-v4.3/defconfig-signed' of git://git./linux/kernel/git/tmlind/linux-omap into next/defconfig
Merge "defconfig changes for v4.3" from Tony Lindgren:
Few defconfig changes for omap2plus_defconfig to enable
SPI NOR, CPTS, touchscreen and ADC used on am335x, am437x
and ra7 devices.
* tag 'omap-for-v4.3/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: omap2plus_defconfig: enable support for M25P80 SPI NOR
ARM: omap2plus_defconfig: enable support for TI CPTS
ARM: omap2plus_defconfig: enable support for TI touchscreen
ARM: omap2plus_defconfig: enable support for TI ADC
Signed-off-by: Olof Johansson <olof@lixom.net>