Merge branch 'topic/caiaq' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 12 Jun 2009 18:03:06 +0000 (20:03 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 12 Jun 2009 18:03:06 +0000 (20:03 +0200)
commit80986be4864239dde9bb69e90be7707344f03725
tree66fccfbed173e556d77d6b4297b41846dc862a15
parenta6093a24bc7da25ce851d22ce3a7bcf1eaca4a95
parent955f2d966534803ec32411086a1698170f17f962
Merge branch 'topic/caiaq' into for-linus

* topic/caiaq:
  ALSA: snd_usb_caiaq: set mixername