Merge branch 'fix/asoc' into for-linus
commit9e8c32cac9929858337e29dd4e28fd87bc073ef5
authorTakashi Iwai <tiwai@suse.de>
Tue, 23 Nov 2010 11:41:17 +0000 (23 12:41 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 23 Nov 2010 11:41:17 +0000 (23 12:41 +0100)
tree81643da2131561b729a09adbbced293b008c6cbf
parent48c88e820fb3e35c5925e4743fd13f200891b7b5
parentbf86f07e8479f4de20d8b19748482eccda240664
Merge branch 'fix/asoc' into for-linus