Merge remote-tracking branch 'arm-soc/imx/multiplatform' into x
authorSascha Hauer <s.hauer@pengutronix.de>
Fri, 16 Nov 2012 15:21:27 +0000 (16:21 +0100)
committerSascha Hauer <s.hauer@pengutronix.de>
Fri, 16 Nov 2012 15:21:27 +0000 (16:21 +0100)

Trivial merge