Merge tag 'imx-defconfig64-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git...

Merge "The arm64 defconfig update for Freescale/NXP support" from Shawn Guo:

 - Clean up defconfig with savedefconfig
 - Enable 48-bit virtual address support
 - Enable driver support for various Freescale/NXP devices

* tag 'imx-defconfig64-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: defconfig: enable freescale/nxp config options
  arm64: defconfig: enable 48-bit virtual addresses
  arm64: defconfig: cleanup the defconfig

diff --cc arch/arm64/configs/defconfig
Simple merge