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

Trivial merge