Merge tag 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into next/fixes...
authorOlof Johansson <olof@lixom.net>
Mon, 17 Sep 2012 00:12:09 +0000 (17:12 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 17 Sep 2012 00:12:09 +0000 (17:12 -0700)
commit03e588e9bd05aebffec3058f226a96eee1619131
tree73252847ad659a7e2ef09ff8e7d202b547c4c0ca
parentf78a88d4976d1c8099d2afc4ceea14fa8b4bfaee
parent48540058612786d365602f3324ed97f9071092de
Merge tag 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into next/fixes-non-critical

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