Merge branch 'imx/for-2.6.36' of git://git.pengutronix.de/git/ukl/linux-2.6 into...

[net-next-2.6.git] / arch / arm / mach-imx / pm-imx27.c

diff --git a/arch/arm/mach-mx2/pm-imx27.c b/arch/arm/mach-imx/pm-imx27.c
similarity index 100%
rename from arch/arm/mach-mx2/pm-imx27.c
rename to arch/arm/mach-imx/pm-imx27.c