Merge for-next omap-testing cbus
authorTony Lindgren <tony@atomide.com>
Wed, 22 Dec 2010 01:31:44 +0000 (17:31 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 22 Dec 2010 01:31:44 +0000 (17:31 -0800)

Trivial merge