Merge fixes fixes-non-critical testing-misc tmp-merge testing-board cbus
authorTony Lindgren <tony@atomide.com>
Mon, 6 Aug 2012 09:19:19 +0000 (02:19 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 6 Aug 2012 09:19:19 +0000 (02:19 -0700)

Trivial merge