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
