]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
projects / mirror_ubuntu-disco-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 81ad969 511b4c1)
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 patch | diff1 | diff2 | blob | history
sound/pci/rme9652/hdsp.c patch | diff1 | diff2 | blob | history

diff --cc sound/pci/Kconfig
Simple merge
diff --cc sound/pci/rme9652/hdsp.c
Simple merge
Ubuntu Disco kernel mirror for Proxmox VE and PMG