Merge branch 'test/pci-rename' into topic/misc
authorTakashi Iwai <tiwai@suse.de>
Tue, 14 Jun 2011 06:56:42 +0000 (08:56 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 14 Jun 2011 06:56:42 +0000 (08:56 +0200)
commit85e4d95da091e35209338962eca232e70819a485
tree8d1e9139d8b4187e639bf721c0818f49c0f22b85
parentb028b81835d7503d68b230446cd5e39d14ff5b9f
parentce1fd36932f230ac1757914b1e99b555c95bae8f
Merge branch 'test/pci-rename' into topic/misc
sound/pci/ctxfi/cthw20k1.c
sound/pci/ctxfi/cthw20k2.c
sound/pci/ctxfi/xfi.c
sound/pci/emu10k1/emu10k1_main.c
sound/pci/rme9652/hdspm.c