7b
parent 1d479f89ec9f29df220bfa1af297ab2f35be1e30
parent c4865679df5453d1bc94c534f4d94a364c0546df
author Takashi Iwai <tiwai@suse.de> 1244611582 +0200
committer Takashi Iwai <tiwai@suse.de> 1244611582 +0200

Merge branch 'topic/ca0106' into for-linus

* topic/ca0106:
  ALSA: ca0106 - Fix master volume scale
  ALSA: ca0106 - Add missing card->mixername field setup
  ALSA: ca0106 - Add missing registrations of vmaster controls
�ʐ�