Merge branch 'peter/topic/for-tony' of git://gitorious.org/omap-audio/linux-audio...
authorTony Lindgren <tony@atomide.com>
Thu, 7 Jul 2011 19:11:23 +0000 (12:11 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 7 Jul 2011 19:11:23 +0000 (12:11 -0700)

Trivial merge