From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 10 May 2016 12:08:29 +0000 (+0200)
Subject: Merge tag 'imx-defconfig-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawng... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=48bc03e5411eb0fd006e54ba62ca77a6dfe5c68d;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'imx-defconfig-4.7' of git://git./linux/kernel/git/shawnguo/linux into next/defconfig

Merge "i.MX defconfig updates for 4.7" from Shawn Guo:

 - Update multi_v5_defconfig for i.MX21/27 and systemd support
 - Update imx_v6_v7_defconfig to support devices found on various i.MX6
   board: FT5x06 and TSC2004 touch, I2C GPIO, MICREL PHY and M41T80 RTC

* tag 'imx-defconfig-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx_v6_v7_defconfig: add CONFIG_MICREL_PHY
  ARM: imx_v6_v7_defconfig: add CONFIG_I2C_GPIO
  ARM: multi_v5_defconfig: Enable recommended options for systemd
  ARM: multi_v5_defconfig: Enable support for MX21/MX27
  ARM: imx_v6_v7_defconfig: add CONFIG_RTC_DRV_M41T80
  ARM: imx_v6_v7_defconfig: add CONFIG_I2C_MUX_GPIO
  ARM: imx_v6_v7_defconfig: add FT5x06 and TSC2004 touch support
---

48bc03e5411eb0fd006e54ba62ca77a6dfe5c68d