Merge for-next omap-testing cbus testing-i2c
authorTony Lindgren <tony@atomide.com>
Thu, 21 Apr 2011 13:15:11 +0000 (06:15 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 21 Apr 2011 13:15:11 +0000 (06:15 -0700)
Merge branches 'for-next', 'omap-testing', 'cbus' and 'testing-i2c' into tmp-rebuild-1303391710


Trivial merge