Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 6 Jun 2011 07:28:49 +0000 (09:28 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 6 Jun 2011 07:28:49 +0000 (09:28 +0200)
commit3190dad97b5105ec9b9720f6d7bea54ee830fc2d
treec76a9cac5eb467cdbdddcad4f5bd444b39c76a15
parent157186bc185cdf588fecba0fc5d7466e3e5d49d7
parentea02c63d57d7ec099f66ddb2942b4022e865cd5f
Merge branch 'fix/asoc' into for-linus