Merge branch 'peter/topic/for-tony_mach-cleanup' of git://gitorious.org/omap-audio...
authorTony Lindgren <[email protected]>
Thu, 7 Jul 2011 19:08:58 +0000 (12:08 -0700)
committerTony Lindgren <[email protected]>
Thu, 7 Jul 2011 19:08:58 +0000 (12:08 -0700)

Trivial merge