Merge branch 'omap-for-v3.7-rc1/fixes-take4'
authorTony Lindgren <tony@atomide.com>
Wed, 17 Oct 2012 02:49:18 +0000 (19:49 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 17 Oct 2012 02:49:18 +0000 (19:49 -0700)

Trivial merge