tree a0fa16e28d807294ee78037364d63e62342d89b3
parent 68d61aed7d9c0cf90a9b7d99a658737f6af42fbc
parent c73a1f13d07fc89734f28760554fc365b91c750a
author Arnd Bergmann <arnd@arndb.de> 1456957082 +0100
committer Arnd Bergmann <arnd@arndb.de> 1456957082 +0100
mergetag object c73a1f13d07fc89734f28760554fc365b91c750a
 type commit
 tag imx-defconfig-4.6
 tagger Shawn Guo <shawnguo@kernel.org> 1456843023 +0800
 
 The i.MX defconfig update for 4.6:
 - Enable i.MX25 Touchscreen controller and ADC support
 - Enable NVMEM OCOTP driver support
 - Clean up mxs_defconfig and imx_v4_v5_defconfig
 - Enable initramfs support
 - Enable PSCI, SAHARA and more Vybrid driver support
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJW1aoYAAoJEFBXWFqHsHzODS8IAJv1Xe6RKzfv7jjbuM3njMtB
 keuMW9eGHCeDu5e9G4j+zb25StQM0pEzFSJmq9zKVp7vxY643dN3L7vw/otkokGW
 7EH6maDQHwuwCWKR0/p5h0kzV59AK7RiEvrcRwhWzbOjrze3R1VDaNFTs1qhqD/p
 mczXTJu7V6GRwKJcW20atDSzbIOUwBO5NSdvUuaglL6FOqLNPYJ3ZfTNmEL5YkNu
 S+pl5p2K6fT8We+cG49EttM134QRNmX/N39GIa+1WKsSabLP9BdBJVBFiEOuqTUq
 rIUfD5SMj91czOsPbj2xQWvw6pDfxf1QUjl024QY8GEI3isk+s0+S0Gv6b+XZgI=
 =QRK1
 -----END PGP SIGNATURE-----

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

Merge "i.MX defconfig update for 4.6" from Shawn Guo:

- Enable i.MX25 Touchscreen controller and ADC support
- Enable NVMEM OCOTP driver support
- Clean up mxs_defconfig and imx_v4_v5_defconfig
- Enable initramfs support
- Enable PSCI, SAHARA and more Vybrid driver support

* tag 'imx-defconfig-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx_v4_v5_defconfig: Enable initramfs support
  ARM: imx_v4_v5_defconfig: Cleanup imx_v4_v5_defconfig
  ARM: mxs_defconfig: Enable initramfs support
  ARM: mxs_defconfig: Cleanup mxs_defconfig
  ARM: imx_v6_v7_defconfig: enable useful configurations for Vybrid
  ARM: imx_v6_v7_defconfig: Select CONFIG_CRYPTO_DEV_SAHARA
  ARM: imx_v4_v5_defconfig: Add I.MX25 Touchscreen controller and ADC support.
  ARM: mxs_defconfig: Select CONFIG_NVMEM_MXS_OCOTP
  ARM: imx_v6_v7_defconfig: Select CONFIG_NVMEM_IMX_OCOTP
  ARM: imx_v6_v7_defconfig: enable psci default