tree fc39dc23297c0e6be730cb0dfd74a34d9c0b8bfd
parent 23b120cdfae4f5c29da69de750d545bad719ead4
parent 100b33c8bd8a3235fd0b7948338d6cbb3db3c63d
author Sascha Hauer <s.hauer@pengutronix.de> 1297409538 +0100
committer Sascha Hauer <s.hauer@pengutronix.de> 1297409594 +0100

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>