Merge for-next omap-testing cbus testing-i2c
authorTony Lindgren <tony@atomide.com>
Fri, 11 Mar 2011 20:42:33 +0000 (12:42 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 11 Mar 2011 20:42:33 +0000 (12:42 -0800)

Trivial merge