Merge omap-fixes-for-linus devel-board tmp-merge fixes-part-2 twl-asoc omap-testing...
authorTony Lindgren <tony@atomide.com>
Mon, 11 Jul 2011 11:23:30 +0000 (04:23 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 11 Jul 2011 11:23:30 +0000 (04:23 -0700)
Merge branches 'omap-fixes-for-linus', 'devel-board', 'tmp-merge', 'fixes-part-2', 'twl-asoc', 'omap-testing' and 'cbus' into tmp-rebuild-1310383408


Trivial merge