Merge branch 'topic/hdsp' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Wed, 10 Jun 2009 05:26:32 +0000 (07:26 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 10 Jun 2009 05:26:32 +0000 (07:26 +0200)
* topic/hdsp:
  ALSA: hdsp - Add a comment about external firmwares for hdsp
  ALSA: hdsp: allow firmware loading from inside the kernel

1  2 
sound/pci/Kconfig
sound/pci/rme9652/hdsp.c

Simple merge
Simple merge