Merge devel-fixes devel-board omap-testing cbus
authorTony Lindgren <tony@atomide.com>
Wed, 22 Jun 2011 09:41:59 +0000 (02:41 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 22 Jun 2011 09:41:59 +0000 (02:41 -0700)
Merge branches 'devel-fixes', 'devel-board', 'omap-testing' and 'cbus' into tmp-rebuild-1308735717


Trivial merge