Merge for-next omap-testing cbus
authorTony Lindgren <tony@atomide.com>
Mon, 1 Nov 2010 17:48:35 +0000 (10:48 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 1 Nov 2010 17:48:35 +0000 (10:48 -0700)

Trivial merge