Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Tue, 18 Jan 2011 13:05:44 +0000 (14:05 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 18 Jan 2011 13:05:44 +0000 (14:05 +0100)
commit27de094f54a4d96bae2cd3121eb157bb8a34f729
tree80a6eb8367289961e8a1cb768dd99e46bf9087bb
parent321051f5daf059e7290aa7d60af55482c8bb896a
parent7322ce21cde92777a9b11e17429d61d1cda6d2c2
Merge branch 'fix/asoc' into for-linus