From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 18 Aug 2017 20:29:30 +0000 (+0200)
Subject: Merge tag 'imx-defconfig-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawn... 
X-Git-Tag: v4.14-rc1~68^2^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dbd540fea0c5396e0213540e4fa24bd794ddbff9;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'imx-defconfig-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/defconfig

Pull "i.MX defconfig updates for 4.14" from Shawn Guo:

 - Enable SPI_GPIO and GPIO_74X164 support which are useful for some
   boards like imx7d-sabresd.
 - Enable build of CODA video codec and staging video4linux drivers.

* tag 'imx-defconfig-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx_v6_v7_defconfig: Enable staging video4linux drivers
  ARM: imx_v6_v7_defconfig: Select the coda driver as module
  ARM: imx_v6_v7_defconfig: Enable GPIO_74X164
  ARM: imx_v6_v7_defconfig: Enable SPI_GPIO
---

dbd540fea0c5396e0213540e4fa24bd794ddbff9