Merge branch 'omap-for-v3.7-rc2/fixes-part2' into omap-for-v3.8/tmp-merge
authorTony Lindgren <tony@atomide.com>
Thu, 25 Oct 2012 18:11:35 +0000 (11:11 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 25 Oct 2012 18:11:35 +0000 (11:11 -0700)

Trivial merge