Merge for-next omap-testing cbus
authorTony Lindgren <tony@atomide.com>
Tue, 21 Dec 2010 03:32:38 +0000 (19:32 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 21 Dec 2010 03:32:38 +0000 (19:32 -0800)

Trivial merge