Merge omap-fixes-for-linus board-part-2 tmp-merge fixes-part-2 twl-asoc omap-testing...
authorTony Lindgren <tony@atomide.com>
Wed, 13 Jul 2011 08:05:49 +0000 (01:05 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 13 Jul 2011 08:05:49 +0000 (01:05 -0700)
Merge branches 'omap-fixes-for-linus', 'board-part-2', 'tmp-merge', 'fixes-part-2', 'twl-asoc', 'omap-testing' and 'cbus' into tmp-rebuild-1310544347


Trivial merge