Merge tag 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
authorOlof Johansson <olof@lixom.net>
Thu, 13 Sep 2012 05:00:07 +0000 (22:00 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 13 Sep 2012 05:00:07 +0000 (22:00 -0700)
commit2bc733e8b443e77db5bb18e1bb8f1c535a92eb8c
treea6985ec4a761efbf2bdbaf7e75110669bf52bc15
parentf5a60d4efc7a3928d6e7d37202a8560ce76cb838
parent48540058612786d365602f3324ed97f9071092de
Merge tag 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes

ARM: i.MX: Fix SSI clock associations for i.MX25/i.MX35

* tag 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6:
  ARM: clk-imx35: Fix SSI clock registration
  ARM: clk-imx25: Fix SSI clock registration
  + Linux 3.6-rc5