Merge branch 'fixes-omap4-dsp' into fixes-non-critical
authorTony Lindgren <tony@atomide.com>
Tue, 26 Jun 2012 10:43:28 +0000 (03:43 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 26 Jun 2012 10:43:28 +0000 (03:43 -0700)

Trivial merge