Merge for-next omap-testing cbus
authorTony Lindgren <tony@atomide.com>
Tue, 18 Jan 2011 22:45:13 +0000 (14:45 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 18 Jan 2011 22:45:13 +0000 (14:45 -0800)

Trivial merge