Merge branches 'omap/prcm' and 'omap/mfd' of git+ssh://master.kernel.org/pub/scm...
Arnd Bergmann [Sun, 17 Jul 2011 19:48:22 +0000 (21:48 +0200)]

Trivial merge