Merge for-next omap-testing cbus testing-i2c
authorTony Lindgren <tony@atomide.com>
Tue, 29 Mar 2011 23:40:12 +0000 (16:40 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 29 Mar 2011 23:40:12 +0000 (16:40 -0700)
Merge branches 'for-next', 'omap-testing', 'cbus' and 'testing-i2c' into tmp-rebuild-1301442011


Trivial merge