Merge branches 'features/assorted', 'features/imx-cpurev', 'features/imx-pata', ...
authorSascha Hauer <s.hauer@pengutronix.de>
Fri, 26 Aug 2011 08:10:12 +0000 (10:10 +0200)
committerSascha Hauer <s.hauer@pengutronix.de>
Fri, 26 Aug 2011 08:10:12 +0000 (10:10 +0200)

Trivial merge