Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 12 Oct 2010 21:43:26 +0000 (22:43 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 12 Oct 2010 21:43:36 +0000 (22:43 +0100)
commit841f48a849e0dc14fe6f3d2bd31e831ac6a76546
treeed5946b32134587db9b6fc3a309bc4737b6199d7
parent10d48b3934940c178635413b5128c33bc17abe1d
parent4793ca4028e4dcdbf2740db50995c9378ded3cf8
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6
arch/arm/mach-imx/mach-cpuimx27.c