Merge for-next omap-testing cbus testing-i2c
authorTony Lindgren <tony@atomide.com>
Wed, 20 Apr 2011 16:02:57 +0000 (09:02 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 20 Apr 2011 16:02:57 +0000 (09:02 -0700)
Merge branches 'for-next', 'omap-testing', 'cbus' and 'testing-i2c' into tmp-rebuild-1303315376


Trivial merge