Merge fixes fixes-non-critical tmp-merge testing-misc testing-board cbus
authorTony Lindgren <tony@atomide.com>
Mon, 30 Apr 2012 17:17:49 +0000 (10:17 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 30 Apr 2012 17:17:49 +0000 (10:17 -0700)

Trivial merge