f310f67f93c21a5 parent a7e54e6de3b01d9085202fdbf0110da425f4af38 parent 687cb98e893f492932abb3e92660d7d828bd44fb author Takashi Iwai 1223862138 +0200 committer Takashi Iwai 1223862138 +0200 Merge branches 'topic/asoc' and 'topic/hda' into for-linus "]€™