Merge tag 'imx-defconfig-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/shawn...

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

Merge "ARM: imx: defconfig update for 3.20" from Shawn Guo:

The i.MX defconfig update for 3.20:
 - Eneable FB_MXS, SPI_FSL_QUADSPI, POWER_RESET_SYSCON and module build
   for a bunch of USB functions

* tag 'imx-defconfig-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx_v6_v7_defconfig: enable more USB functions
  ARM: imx_v6_v7_defconfig: Select CONFIG_FB_MXS
  ARM: imx_v6_v7_defconfig: Select SPI_FSL_QUADSPI by default
  ARM: imx_v6_v7_defconfig: add POWER_RESET_SYSCON

Signed-off-by: Olof Johansson <olof@lixom.net>