Merge tmp-merge dt-part2 pm sr ams-delta omap4 driver board testing-board testing...
authorTony Lindgren <tony@atomide.com>
Fri, 9 Mar 2012 20:38:08 +0000 (12:38 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 9 Mar 2012 20:38:08 +0000 (12:38 -0800)
Merge branches 'tmp-merge', 'dt-part2', 'pm', 'sr', 'ams-delta', 'omap4', 'driver', 'board', 'testing-board', 'testing-misc', 'cbus', 'cleanup-timer', 'cleanup-hwmod' and 'hwmod' into tmp-rebuild-1331325486


Trivial merge