Merge for-next omap-testing cbus
authorTony Lindgren <tony@atomide.com>
Thu, 3 Mar 2011 01:28:58 +0000 (17:28 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 3 Mar 2011 01:28:58 +0000 (17:28 -0800)

Trivial merge