Merge for-next omap-testing cbus
authorTony Lindgren <tony@atomide.com>
Fri, 3 Dec 2010 01:12:21 +0000 (17:12 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 3 Dec 2010 01:12:21 +0000 (17:12 -0800)

Trivial merge