Merge for-next omap-testing cbus testing-i2c
authorTony Lindgren <tony@atomide.com>
Mon, 9 May 2011 15:16:13 +0000 (08:16 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 9 May 2011 15:16:13 +0000 (08:16 -0700)
Merge branches 'for-next', 'omap-testing', 'cbus' and 'testing-i2c' into tmp-rebuild-1304954172


Trivial merge