From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 1 Jun 2015 16:08:23 +0000 (+0200)
Subject: Merge tag 'imx-defconfig-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawng... 
X-Git-Tag: firefly_0821_release~176^2~1554^2~6
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c413d7bab01e88e223efee80b858020164e5eff6;p=firefly-linux-kernel-4.4.55.git

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

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

 - Enable i.MX7D and LS1021A SoC support
 - Enable support for WL1271 WIFI/BT, SX8654 I2C touchscreen and PCF8523
   RTC, which can be found on Armadeus Systems APF6 and Cubox-i boards.

* tag 'imx-defconfig-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx_v6_v7_defconfig: updates for Armadeus Systems APF6 boards
  ARM: config: imx_v6_v7_defconfig add imx7d support
  ARM: imx_v6_v7_defconfig: Select LS1021A
  ARM: imx_v6_v7_defconfig: Enable RTC PCF8523 support
---

c413d7bab01e88e223efee80b858020164e5eff6