Merge for-next omap-testing cbus
authorTony Lindgren <tony@atomide.com>
Tue, 8 Feb 2011 02:47:43 +0000 (18:47 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 8 Feb 2011 02:47:43 +0000 (18:47 -0800)

Trivial merge