Merge for-next omap-testing cbus
authorTony Lindgren <tony@atomide.com>
Thu, 30 Dec 2010 18:44:34 +0000 (10:44 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 30 Dec 2010 18:44:34 +0000 (10:44 -0800)

Trivial merge