You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Takashi Iwai c817eebec5 Merge branch 'fix/cxt-stable' into fix/hda ... Merge fixes for Thinkpad docking-station regressions for 3.3 kernels back to 3.4. These were committed in that branch to make the stable merging easier. Conflicts: sound/pci/hda/patch_conexant.c		13 years ago
..
Kconfig	ALSA: Introduce common helper functions for jack-detection control	13 years ago
Makefile	ALSA: hda - Cache the jack-detection value	13 years ago
hda_beep.c	sound: Add export.h for THIS_MODULE/EXPORT_SYMBOL where needed	13 years ago
hda_beep.h	…
hda_codec.c	ALSA: hda - Add expose_enum_ctl flag to snd_hda_add_vmaster_hook()	13 years ago
hda_codec.h	ALSA: hda - Fix proc output for ADC amp values of CX20549	13 years ago
hda_eld.c	ALSA: hda - hide HDMI/ELD printks unless snd.debug=2	13 years ago
hda_generic.c	sound: Add export.h for THIS_MODULE/EXPORT_SYMBOL where needed	13 years ago
hda_hwdep.c	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	13 years ago
hda_intel.c	ALSA: hda - Set codec to D3 forcibly even if not used	13 years ago
hda_jack.c	ALSA: hda - Add codec->no_jack_detect flag	13 years ago
hda_jack.h	ALSA: hda - Make is_jack_detectable() as non-inlined	13 years ago
hda_local.h	ALSA: hda - Add expose_enum_ctl flag to snd_hda_add_vmaster_hook()	13 years ago
hda_proc.c	ALSA: hda - Fix proc output for ADC amp values of CX20549	13 years ago
hda_trace.h	ALSA: hda - Add tracepoint for unsolicited events	14 years ago
patch_analog.c	ALSA: hda - Return the created kcontrol in __snd_hda_add_vmaster()	13 years ago
patch_ca0110.c	ALSA: hda - Give more unique names by snd_hda_get_pin_label()	13 years ago
patch_ca0132.c	ALSA: hda - Fix error handling in patch_ca0132.c	13 years ago
patch_cirrus.c	ALSA: hda - Kill hyphenated names	13 years ago
patch_cmedia.c	sound: Add module.h to the previously silent sound users	13 years ago
patch_conexant.c	Merge branch 'fix/cxt-stable' into fix/hda	13 years ago
patch_hdmi.c	ALSA: hda - hide HDMI/ELD printks unless snd.debug=2	13 years ago
patch_realtek.c	ALSA: hda/realtek - Fix regression on Quanta/Gericom KN1	13 years ago
patch_si3054.c	sound: Add module.h to the previously silent sound users	13 years ago
patch_sigmatel.c	ALSA: hda/sigmatel - Fix inverted mute LED	13 years ago
patch_via.c	ALSA: hda/via - Add a few sanity checks	13 years ago