tree bfdc9aa500a97c30789742299597f689f0e55ef3
parent 81ad969dbf8b10c3e79c5811b8328c054c21ef39
parent 511b4c171a8054506e8898c40833e31270689b8b
author Takashi Iwai <tiwai@suse.de> 1244611592 +0200
committer Takashi Iwai <tiwai@suse.de> 1244611592 +0200

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