Merge commit 'v3.1-rc1' into imx-fixes
authorSascha Hauer <s.hauer@pengutronix.de>
Mon, 8 Aug 2011 06:22:41 +0000 (08:22 +0200)
committerSascha Hauer <s.hauer@pengutronix.de>
Mon, 8 Aug 2011 06:22:41 +0000 (08:22 +0200)

Trivial merge