Merge branch 'peter/for-benoit' of git://gitorious.org/omap-audio/linux-audio into for_3.9/dts