Merge branch 'for-linus' of git://github.com/tiwai/sound