Merge fixes fixes-non-critical testing-misc tmp-merge testing-board cbus
authorTony Lindgren <tony@atomide.com>
Wed, 4 Jul 2012 07:54:20 +0000 (00:54 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 4 Jul 2012 07:54:20 +0000 (00:54 -0700)

Trivial merge