Merge tag 'omap-for-v4.3/defconfig-signed' of git://git.kernel.org/pub/scm/linux...
authorOlof Johansson <olof@lixom.net>
Wed, 22 Jul 2015 23:28:37 +0000 (16:28 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 22 Jul 2015 23:28:37 +0000 (16:28 -0700)
commitf1d28f0b392628fbd263ad833469caeb052cb084
tree2b9a0daee30a65c9df617e48e6fa6a726b95b293
parentea7b44b6e95750e1784ce34e7688a974976d2ad1
parentda104dc845afbebcad6d87bd5810c266a426f4dc
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>