From: Olof Johansson <olof@lixom.net>
Date: Thu, 8 Mar 2012 17:20:29 +0000 (-0800)
Subject: Merge tag 'imx35-imx5-aips-setup' of git://git.pengutronix.de/git/imx/linux-2.6 into... 
X-Git-Tag: v3.4-rc1~89^2~4
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/acf346084bca289a00020a5c29c23673b801b380

Merge tag 'imx35-imx5-aips-setup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/soc

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
---

acf346084bca289a00020a5c29c23673b801b380