Merge branch 'topic/pci-cleanup' into for-next
authorTakashi Iwai <tiwai@suse.de>
Sun, 11 Jan 2015 10:26:48 +0000 (11:26 +0100)
committerTakashi Iwai <tiwai@suse.de>
Sun, 11 Jan 2015 10:26:48 +0000 (11:26 +0100)
18 files changed:
1  2 
sound/pci/atiixp.c
sound/pci/atiixp_modem.c
sound/pci/cs4281.c
sound/pci/cs46xx/cs46xx_lib.c
sound/pci/ctxfi/cthw20k1.c
sound/pci/ctxfi/cthw20k2.c
sound/pci/echoaudio/echoaudio.c
sound/pci/emu10k1/emu10k1.c
sound/pci/ens1370.c
sound/pci/fm801.c
sound/pci/hda/hda_intel.c
sound/pci/ice1712/ice1712.c
sound/pci/nm256/nm256.c
sound/pci/oxygen/oxygen_lib.c
sound/pci/riptide/riptide.c
sound/pci/sis7019.c
sound/pci/trident/trident_main.c
sound/pci/ymfpci/ymfpci_main.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge