diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-20 10:41:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-20 10:41:00 -0700 |
| commit | a54769c505db4bdf01d19dca64d15cb303503d71 (patch) | |
| tree | ad1c425e5a96962a5ded0740de75bab5e2e0dea1 /drivers/net/wireless/rt2x00/rt2800.h | |
| parent | 73bebc8bafb6a880a4db63d60bc4b8d9d6879c9e (diff) | |
| parent | c817eebec5971febab86d397582954bd52f403a8 (diff) | |
Merge tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"Fixes for a few regressions of HD-audio, originated partly from 3.4
and partly 3.3.
The fixes for ThinkPad docking-station are for 3.3 kernels, thus they
are based on 3.3 then merged back to 3.4, so that they can be merged
to stable tree cleanly. The non-trivial merge conflicts are because
of this action.
In addition, a couple of trivial fixes for documentation and a long-
standing issue in the listing of built-in sound driver at boot time."
* tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: hda/conexant - Set up the missing docking-station pins
ALSA: hda/conexant - Don't set HP pin-control bit unconditionally
ALSA: workaround: change the timing of alsa_sound_last_init()
ALSA: hda/sigmatel - Fix inverted mute LED
ALSA: hda/realtek - Fix regression on Quanta/Gericom KN1
ALSA: fix core/vmaster.c kernel-doc warning
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2800.h')
0 files changed, 0 insertions, 0 deletions