Merge fixes tmp-merge testing-misc testing-board cbus
authorTony Lindgren <tony@atomide.com>
Thu, 10 May 2012 00:32:11 +0000 (17:32 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 10 May 2012 00:32:11 +0000 (17:32 -0700)

Trivial merge