Merge fixes testing-misc tmp-merge testing-board cbus
authorTony Lindgren <tony@atomide.com>
Mon, 4 Jun 2012 10:21:49 +0000 (03:21 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 4 Jun 2012 10:21:49 +0000 (03:21 -0700)

Trivial merge