Merge branch 'imx/fixes-for-3.5' of git://git.linaro.org/people/shawnguo/linux-2...
authorOlof Johansson <olof@lixom.net>
Thu, 7 Jun 2012 18:48:02 +0000 (11:48 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 7 Jun 2012 18:48:09 +0000 (11:48 -0700)
* 'imx/fixes-for-3.5' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: imx6: exit coherency when shutting down a cpu
  ARM: mx51: Add pinctrl_provide_dummies()
  ARM: mx31: Add pinctrl_provide_dummies()

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

Trivial merge