Merge tag 'imx35-imx5-aips-setup' of git://git.pengutronix.de/git/imx/linux-2.6 into...
authorOlof Johansson <olof@lixom.net>
Thu, 8 Mar 2012 17:20:29 +0000 (09:20 -0800)
committerOlof Johansson <olof@lixom.net>
Thu, 8 Mar 2012 17:20:29 +0000 (09:20 -0800)
i.MX35/5 AIPS setup

Includes sync up to 3.3-rc6

* tag 'imx35-imx5-aips-setup' of git://git.pengutronix.de/git/imx/linux-2.6:
  ARM: mx35: Setup the AIPS registers
  ARM: mx5: Use common function for configuring AIPS


Trivial merge