tree 05daa9670d9cf1a474eb9cee948532f5f4afc8f0
parent a963203c18e5988506bd173b75ca002df528ed48
parent c6e24d4db824d277303201811e88626778c59999
author Takashi Iwai <tiwai@suse.de> 1244611583 +0200
committer Takashi Iwai <tiwai@suse.de> 1244611583 +0200

Merge branch 'topic/caiaq' into for-linus

* topic/caiaq:
  ALSA: snd_usb_caiaq: bump version number
  ALSA: snd_usb_caiaq: give better shortname
  ALSA: Core - add snd_card_set_id() function
  ALSA: snd_usb_caiaq: give better longname
  ALSA: snd_usb_caiaq: use strlcpy
  ALSA: snd_usb_caiaq: clean whitespaces