Commits

Merge commit 'v2.6.38-rc4' into imx-for-2.6.39 Conflicts: arch/arm/mach-mxs/clock-mx28.c Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Merge commit 'v2.6.38-rc4' into imx-for-2.6.39 Conflicts: arch/arm/mach-mxs/clock-mx28.c Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>