Merge tag 'imx-soc-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...
authorOlof Johansson <olof@lixom.net>
Tue, 22 Dec 2015 22:58:48 +0000 (14:58 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 22 Dec 2015 22:58:48 +0000 (14:58 -0800)
commit9d67d4624febcd14bd6719fb4913319f49201066
treee098c67a57e256038021033e887734c05ded7385
parent45e2916be242ccf50cdc6da7863245722a46ea9e
parentf1858b0e801a45d801dc23bc1ff5be14805022c8
Merge tag 'imx-soc-4.5' of git://git./linux/kernel/git/shawnguo/linux into next/soc

The i.MX SoC updates for 4.5:
- Select HAVE_IMX_SRC for i.MX7 to avoid a randconfig build error
- Enable cpufreq support on i.MX7D
- A couple of random cleanup on iomux-imx31 and mach-imx6ul

* tag 'imx-soc-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx: select SRC for i.MX7
  ARM: mach-imx: iomux-imx31: fix spelling mistake in error message
  ARM: imx: enable cpufreq device on i.mx7d
  mach-imx/mach-imx6ul.c: proper constness with __initconst

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/mach-imx/Kconfig