Merge tag 'imx-defconfig-4.9' of...

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

Merge "i.MX defconfig updates for 4.9" from Shawn Guo:
 - Enable i.MX6 SATA and cpufreq driver support in multi_v7_defconfig.
 - Enable MPL3115, Etnaviv GPU, WM8960 Codec driver and more USB
   functions support in imx_v6_v7_defconfig.

* tag 'imx-defconfig-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx_v6_v7_defconfig: Select the wm8960 codec driver
  ARM: imx_v6_v7_defconfig: Add CONFIG_MPL3115
  ARM: imx_v6_v7_defconfig: Enable GPU support
  ARM: imx_v6_v7_defconfig: enable more USB configurations
  ARM: multi_v7_defconfig: Enable ARM_IMX6Q_CPUFREQ
  ARM: multi_v7_defconfig: Enable AHCI_IMX