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

Trivial merge