Merge for-next omap-testing cbus
authorTony Lindgren <tony@atomide.com>
Thu, 20 Jan 2011 01:22:40 +0000 (17:22 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 20 Jan 2011 01:22:40 +0000 (17:22 -0800)

Trivial merge