Merge remote-tracking branch 'arm-soc/imx/multiplatform' into imx25-dt
authorSascha Hauer <s.hauer@pengutronix.de>
Mon, 12 Nov 2012 11:08:12 +0000 (12:08 +0100)
committerSascha Hauer <s.hauer@pengutronix.de>
Mon, 12 Nov 2012 11:08:12 +0000 (12:08 +0100)

Trivial merge