Merge omap-fixes-for-linus devel-cleanup devel-fixes tmp-merge 4460 omap-testing...
authorTony Lindgren <tony@atomide.com>
Fri, 8 Jul 2011 13:03:46 +0000 (06:03 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 8 Jul 2011 13:03:46 +0000 (06:03 -0700)
Merge branches 'omap-fixes-for-linus', 'devel-cleanup', 'devel-fixes', 'tmp-merge', '4460', 'omap-testing' and 'cbus' into tmp-rebuild-1310130224


Trivial merge