Merge branch 'omap-for-v3.8/tmp-merge'
authorTony Lindgren <tony@atomide.com>
Tue, 13 Nov 2012 00:49:24 +0000 (16:49 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 13 Nov 2012 00:49:24 +0000 (16:49 -0800)

Trivial merge