Merge fixes fixes-non-critical testing-misc tmp-merge testing-board cbus
authorTony Lindgren <tony@atomide.com>
Mon, 2 Jul 2012 13:20:14 +0000 (06:20 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 2 Jul 2012 13:20:14 +0000 (06:20 -0700)

Trivial merge