Merge for-next omap-testing cbus
authorTony Lindgren <tony@atomide.com>
Tue, 16 Nov 2010 21:41:29 +0000 (13:41 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 16 Nov 2010 21:41:29 +0000 (13:41 -0800)

Trivial merge