Merge branch 'omap-for-v3.8-rc2/fixes'
authorTony Lindgren <tony@atomide.com>
Thu, 3 Jan 2013 20:13:42 +0000 (12:13 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 3 Jan 2013 20:13:42 +0000 (12:13 -0800)

Trivial merge