Merge branch 'imx-for-2.6.36' of git://git.pengutronix.de/git/imx/linux-2.6
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 1 Sep 2010 09:08:50 +0000 (10:08 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 1 Sep 2010 09:08:50 +0000 (10:08 +0100)
commitb6d17c1a8e64e8b7f58dde3d353de664a492908a
tree160c175e9c3ab65a7221effadee78eba24e7d2f4
parent1fd317076caf1ee22ddb6a7853a0ca462f0233c5
parent14f0f512ba6f4eccc9b7cf67be47439ed2917afb
Merge branch 'imx-for-2.6.36' of git://git.pengutronix.de/git/imx/linux-2.6
arch/arm/mach-mx25/mach-cpuimx25.c
arch/arm/mach-mx3/mach-cpuimx35.c