Merge branch 'topic/caiaq' into for-linus
commitab2f06cb6b7cc4cb782387a19fbfed3dfe8a8436
authorTakashi Iwai <tiwai@suse.de>
Wed, 10 Jun 2009 05:26:23 +0000 (10 07:26 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 10 Jun 2009 05:26:23 +0000 (10 07:26 +0200)
tree05daa9670d9cf1a474eb9cee948532f5f4afc8f0
parenta963203c18e5988506bd173b75ca002df528ed48
parentc6e24d4db824d277303201811e88626778c59999
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