Merge devel-fixes devel-board omap-testing cbus
authorTony Lindgren <tony@atomide.com>
Tue, 14 Jun 2011 12:59:57 +0000 (05:59 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 14 Jun 2011 12:59:57 +0000 (05:59 -0700)
Merge branches 'devel-fixes', 'devel-board', 'omap-testing' and 'cbus' into tmp-rebuild-1308056395


Trivial merge