]> www.infradead.org Git - linux-platform-drivers-x86.git/commitdiff
projects / linux-platform-drivers-x86.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c71656c 38bb363)
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

1  2 
arch/arm/mach-imx/mm-imx3.c patch | diff1 | diff2 | blob | history
arch/arm/mach-imx/mm-imx5.c patch | diff1 | diff2 | blob | history
arch/arm/mach-omap2/io.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-imx/mm-imx3.c
Simple merge
diff --cc arch/arm/mach-imx/mm-imx5.c
Simple merge
diff --cc arch/arm/mach-omap2/io.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.