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)
commit3c2fcf36d78d75eef46c2e39483ff8c3230ae335
treebfdc9aa500a97c30789742299597f689f0e55ef3
parent81ad969dbf8b10c3e79c5811b8328c054c21ef39
parent511b4c171a8054506e8898c40833e31270689b8b
Merge branch 'topic/hdsp' into for-linus

* topic/hdsp:
  ALSA: hdsp - Add a comment about external firmwares for hdsp
  ALSA: hdsp: allow firmware loading from inside the kernel
sound/pci/Kconfig
sound/pci/rme9652/hdsp.c