Merge branches 'cleanups/mx3-mm-v2' and 'cleanups/mxs' into imx-cleanup
authorSascha Hauer <s.hauer@pengutronix.de>
Tue, 4 Oct 2011 08:55:53 +0000 (10:55 +0200)
committerSascha Hauer <s.hauer@pengutronix.de>
Tue, 4 Oct 2011 08:55:53 +0000 (10:55 +0200)

Trivial merge