Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Wed, 2 Jun 2010 12:18:13 +0000 (14:18 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 2 Jun 2010 12:18:13 +0000 (14:18 +0200)
commitd4376802999d478a103868d7e7b1f473e4a387af
treec73a34f5b26086bc5b98307b25a8d3e754af88a0
parentc7a441bba9de3b4e166b6a4449208bc906d70558
parente854df613fe934c94a0b39eccb4104e72ccbbded
Merge branch 'fix/asoc' into for-linus