Merge branches 'topic/asoc' and 'topic/hda' into for-linus
Takashi Iwai [Mon, 13 Oct 2008 01:42:18 +0000 (03:42 +0200)]

Trivial merge