Merge branch 'fix/asoc' of git://github.com/tiwai/sound