Merge for-next omap-testing cbus testing-i2c
authorTony Lindgren <tony@atomide.com>
Tue, 8 Mar 2011 23:41:12 +0000 (15:41 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 8 Mar 2011 23:41:12 +0000 (15:41 -0800)

Trivial merge