Merge for-next omap-testing cbus
authorTony Lindgren <tony@atomide.com>
Thu, 10 Feb 2011 03:03:32 +0000 (19:03 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 10 Feb 2011 03:03:32 +0000 (19:03 -0800)

Trivial merge