Merge fixes testing-misc tmp-merge testing-board cbus
authorTony Lindgren <tony@atomide.com>
Fri, 11 May 2012 19:12:11 +0000 (12:12 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 11 May 2012 19:12:11 +0000 (12:12 -0700)

Trivial merge