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)
commitacf346084bca289a00020a5c29c23673b801b380
tree1ab7f6eeefd0564d8fb708b858dc19c8b7e0a67c
parentc71656c018c8551eca45b2f873b239f0303d74cb
parent38bb3630bcba25f16106166a4aaf211c1d195863
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
arch/arm/mach-imx/mm-imx3.c
arch/arm/mach-imx/mm-imx5.c
arch/arm/mach-omap2/io.c