Merge branch 'omap-for-v3.8/tmp-merge'
authorTony Lindgren <tony@atomide.com>
Thu, 15 Nov 2012 01:48:39 +0000 (17:48 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 15 Nov 2012 01:48:39 +0000 (17:48 -0800)

Trivial merge