Merge branch 'for-4.2' into for-next

2026-09-28 19:20:30 +00:00 · 2015-04-27 16:42:45 +02:00 · 2015-04-27 16:42:45 +02:00 · f1a77547c2
commit f1a77547c2
parent 30e5f003ff 8ab418d365
53 changed files with 2882 additions and 2564 deletions
--- a/include/sound/core.h
+++ b/include/sound/core.h
--- a/include/sound/hda_register.h
+++ b/include/sound/hda_register.h
--- a/include/sound/hdaudio.h
+++ b/include/sound/hdaudio.h
--- a/include/sound/info.h
+++ b/include/sound/info.h
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
--- a/sound/core/Makefile
+++ b/sound/core/Makefile
--- a/sound/core/info.c
+++ b/sound/core/info.c
--- a/sound/core/info_oss.c
+++ b/sound/core/info_oss.c
--- a/sound/core/init.c
+++ b/sound/core/init.c
--- a/sound/core/seq/Makefile
+++ b/sound/core/seq/Makefile
--- a/sound/core/seq/seq_info.c
+++ b/sound/core/seq/seq_info.c
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
--- a/sound/core/sound_oss.c
+++ b/sound/core/sound_oss.c
--- a/sound/hda/Kconfig
+++ b/sound/hda/Kconfig
--- a/sound/hda/Makefile
+++ b/sound/hda/Makefile
--- a/sound/hda/hdac_bus.c
+++ b/sound/hda/hdac_bus.c
--- a/sound/hda/hdac_controller.c
+++ b/sound/hda/hdac_controller.c
--- a/sound/hda/hdac_device.c
+++ b/sound/hda/hdac_device.c
--- a/sound/hda/hdac_stream.c
+++ b/sound/hda/hdac_stream.c
--- a/sound/pci/ad1889.c
+++ b/sound/pci/ad1889.c
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
--- a/sound/pci/als300.c
+++ b/sound/pci/als300.c
--- a/sound/pci/als4000.c
+++ b/sound/pci/als4000.c
--- a/sound/pci/au88x0/au88x0.c
+++ b/sound/pci/au88x0/au88x0.c
--- a/sound/pci/aw2/aw2-alsa.c
+++ b/sound/pci/aw2/aw2-alsa.c
--- a/sound/pci/azt3328.c
+++ b/sound/pci/azt3328.c
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
--- a/sound/pci/cs5535audio/cs5535audio.c
+++ b/sound/pci/cs5535audio/cs5535audio.c
--- a/sound/pci/ctxfi/cthw20k1.c
+++ b/sound/pci/ctxfi/cthw20k1.c
--- a/sound/pci/ctxfi/cthw20k2.c
+++ b/sound/pci/ctxfi/cthw20k2.c
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
--- a/sound/pci/es1938.c
+++ b/sound/pci/es1938.c
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
--- a/sound/pci/hda/Kconfig
+++ b/sound/pci/hda/Kconfig
--- a/sound/pci/hda/Makefile
+++ b/sound/pci/hda/Makefile
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
--- a/sound/pci/hda/hda_controller.c
+++ b/sound/pci/hda/hda_controller.c
--- a/sound/pci/hda/hda_controller.h
+++ b/sound/pci/hda/hda_controller.h
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
--- a/sound/pci/hda/hda_intel.h
+++ b/sound/pci/hda/hda_intel.h
--- a/sound/pci/hda/hda_intel_trace.h
+++ b/sound/pci/hda/hda_intel_trace.h
--- a/sound/pci/hda/hda_tegra.c
+++ b/sound/pci/hda/hda_tegra.c
--- a/sound/pci/hda/patch_ca0132.c
+++ b/sound/pci/hda/patch_ca0132.c
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
--- a/sound/pci/lx6464es/lx6464es.c
+++ b/sound/pci/lx6464es/lx6464es.c
--- a/sound/pci/maestro3.c
+++ b/sound/pci/maestro3.c
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
--- a/sound/pci/pcxhr/pcxhr.c
+++ b/sound/pci/pcxhr/pcxhr.c
--- a/sound/pci/sis7019.c
+++ b/sound/pci/sis7019.c
--- a/sound/pci/sonicvibes.c
+++ b/sound/pci/sonicvibes.c
--- a/sound/pci/trident/trident_main.c
+++ b/sound/pci/trident/trident_main.c