Merge branch 'topic/ca0106' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Wed, 10 Jun 2009 05:26:22 +0000 (07:26 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 10 Jun 2009 05:26:22 +0000 (07:26 +0200)
commita963203c18e5988506bd173b75ca002df528ed48
tree454d736eed6c5d6c398e0bd5b21e971f8f0ad77b
parent1d479f89ec9f29df220bfa1af297ab2f35be1e30
parentc4865679df5453d1bc94c534f4d94a364c0546df
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