Commits

Merge commit 'v2.6.37-rc4' into imx-for-2.6.38 Done to resolve merge conflict: Conflicts: arch/arm/mach-mx25/devices-imx25.h Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Merge commit 'v2.6.37-rc4' into imx-for-2.6.38 Done to resolve merge conflict: Conflicts: arch/arm/mach-mx25/devices-imx25.h Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>