Merge for-next omap-testing cbus
authorTony Lindgren <tony@atomide.com>
Fri, 22 Oct 2010 18:20:56 +0000 (11:20 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 22 Oct 2010 18:20:56 +0000 (11:20 -0700)

Trivial merge