Merge branch 'omap-for-v3.7-rc1/tmp-merge'
authorTony Lindgren <tony@atomide.com>
Tue, 9 Oct 2012 03:16:55 +0000 (20:16 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 9 Oct 2012 03:16:55 +0000 (20:16 -0700)

Trivial merge