Merge for-next omap-testing cbus
authorTony Lindgren <tony@atomide.com>
Fri, 17 Dec 2010 00:20:04 +0000 (16:20 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 17 Dec 2010 00:20:04 +0000 (16:20 -0800)

Trivial merge