diff options
author | Olof Johansson <olof@lixom.net> | 2012-03-08 09:20:29 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-03-08 09:20:29 -0800 |
commit | acf346084bca289a00020a5c29c23673b801b380 (patch) | |
tree | 1ab7f6eeefd0564d8fb708b858dc19c8b7e0a67c /arch/ia64 | |
parent | c71656c018c8551eca45b2f873b239f0303d74cb (diff) | |
parent | 38bb3630bcba25f16106166a4aaf211c1d195863 (diff) |
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
Diffstat (limited to 'arch/ia64')
0 files changed, 0 insertions, 0 deletions