Merge dt-merge board testing-board cbus
authorTony Lindgren <tony@atomide.com>
Tue, 4 Oct 2011 00:01:56 +0000 (17:01 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 4 Oct 2011 00:01:56 +0000 (17:01 -0700)
Merge branches 'dt-merge', 'board', 'testing-board' and 'cbus' into tmp-rebuild-1317686513


Trivial merge