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