]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
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)
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


Trivial merge