Merge for-next omap-testing cbus
authorTony Lindgren <tony@atomide.com>
Thu, 25 Nov 2010 01:23:29 +0000 (17:23 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 25 Nov 2010 01:23:29 +0000 (17:23 -0800)

Trivial merge