Merge for-next omap-testing cbus
authorTony Lindgren <tony@atomide.com>
Tue, 15 Feb 2011 02:08:55 +0000 (18:08 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 15 Feb 2011 02:08:55 +0000 (18:08 -0800)

Trivial merge