Merge branch 'peter/for-tony' of git://gitorious.org/omap-audio/linux-audio into...