Merge branch 'omap-for-v3.12/tmp-merge'
authorTony Lindgren <tony@atomide.com>
Mon, 26 Aug 2013 12:56:21 +0000 (05:56 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 26 Aug 2013 12:56:21 +0000 (05:56 -0700)

Trivial merge