Merge for-next omap-testing cbus testing-i2c
authorTony Lindgren <tony@atomide.com>
Tue, 19 Apr 2011 06:45:49 +0000 (23:45 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 19 Apr 2011 06:45:49 +0000 (23:45 -0700)
Merge branches 'for-next', 'omap-testing', 'cbus' and 'testing-i2c' into tmp-rebuild-1303195548


Trivial merge