Merge branch 'topic/core-id-check' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Wed, 10 Jun 2009 05:26:26 +0000 (07:26 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 10 Jun 2009 05:26:26 +0000 (07:26 +0200)
commitd3e3743694cbfd64450b3468e11b40ba8c6f4369
tree625a71167bb1c7195aafff8ab333ba86d04e9fba
parentd108728ea24a766335ae22f10bfaf41f248fb70e
parent5fdc18d938c99399b73fe894bc24cb9400a1a2ee
Merge branch 'topic/core-id-check' into for-linus

* topic/core-id-check:
  ALSA: Core - clean up snd_card_set_id* calls and remove possible id collision
  ALSA: Fix double locking of card list in snd_card_register()