Merge branch 'omap-for-v3.8/tmp-merge'
authorTony Lindgren <tony@atomide.com>
Mon, 26 Nov 2012 22:37:55 +0000 (14:37 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 26 Nov 2012 22:37:55 +0000 (14:37 -0800)

Trivial merge