Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
[pandora-kernel.git] / arch / arm / mach-imx / mach-mx27_3ds.c
Simple merge