Merge for-next omap-testing cbus
authorTony Lindgren <tony@atomide.com>
Tue, 1 Mar 2011 23:07:38 +0000 (15:07 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 1 Mar 2011 23:07:38 +0000 (15:07 -0800)

Trivial merge