Merge for-next omap-testing cbus testing-i2c
authorTony Lindgren <tony@atomide.com>
Mon, 11 Apr 2011 09:59:59 +0000 (02:59 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 11 Apr 2011 09:59:59 +0000 (02:59 -0700)
Merge branches 'for-next', 'omap-testing', 'cbus' and 'testing-i2c' into tmp-rebuild-1302515998


Trivial merge