Merge for-next omap-testing cbus
authorTony Lindgren <tony@atomide.com>
Thu, 17 Feb 2011 00:31:12 +0000 (16:31 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 17 Feb 2011 00:31:12 +0000 (16:31 -0800)

Trivial merge