Merge for-next omap-testing cbus testing-i2c
authorTony Lindgren <tony@atomide.com>
Wed, 11 May 2011 17:49:25 +0000 (10:49 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 11 May 2011 17:49:25 +0000 (10:49 -0700)
Merge branches 'for-next', 'omap-testing', 'cbus' and 'testing-i2c' into tmp-rebuild-1305136164


Trivial merge