Merge for-next omap-testing cbus
authorTony Lindgren <tony@atomide.com>
Wed, 2 Feb 2011 01:15:21 +0000 (17:15 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 2 Feb 2011 01:15:21 +0000 (17:15 -0800)

Trivial merge