Merge for-next omap-testing cbus
authorTony Lindgren <tony@atomide.com>
Tue, 30 Nov 2010 23:04:05 +0000 (15:04 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 30 Nov 2010 23:04:05 +0000 (15:04 -0800)

Trivial merge