Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 28 Jan 2011 07:25:43 +0000 (08:25 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 28 Jan 2011 07:25:43 +0000 (08:25 +0100)
commitdcc3c4c016481de3fdb99c1f6ecb04d4229513d4
treed3d40306e6dfe0971c6f7fca6a0e37bbe66d2215
parentded9f5238bb719737f82b0b5b957937cb0203804
parenta3adfa00e8089aa72826c6ba04bcb18cfceaf0a9
Merge branch 'fix/asoc' into for-linus