Merge tag 'imx-defconfig-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawng...
authorOlof Johansson <olof@lixom.net>
Wed, 6 Jul 2016 04:15:26 +0000 (21:15 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 6 Jul 2016 04:15:26 +0000 (21:15 -0700)
The i.MX defconfig update for 4.8:
 - Enable TOUCHSCREEN_ADS7846, USB_FUNCTIONFS and USB_USBNET support

* tag 'imx-defconfig-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx_v6_v7_defconfig: Select ADS7846 support
  ARM: imx_v6_v7_defconfig: enable USB FFS gadget
  ARM: imx_v6_v7_defconfig: build in usbnet to support NFS for non-ethernet board

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

Trivial merge