Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Sun, 2 Jan 2011 10:01:55 +0000 (11:01 +0100)
committerTakashi Iwai <tiwai@suse.de>
Sun, 2 Jan 2011 10:01:55 +0000 (11:01 +0100)
commit98cbe8256f3bf6339e404e5a6b2f57654a606462
tree4c5499468a4276d88fc0976be2f23a3ba72b5694
parentb982de8bc1ad0307a0c7e9e5e8f3681a7ade7241
parent798ccf237a256dcd61af9964639aad13225c7332
Merge branch 'fix/asoc' into for-linus