summaryrefslogtreecommitdiffstats
path: root/include/keys
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-02-08 23:56:39 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2012-02-08 23:56:39 +0100
commite862f2e4693f287669e84971c778bf071bd0526b (patch)
treee26818cbe931482d59d77741bde8ab12a30dc08e /include/keys
parentMerge tag 'fbdev-fixes-for-3.3-1' of git://github.com/schandinat/linux-2.6 (diff)
parentMerge tag 'asoc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... (diff)
downloadlinux-e862f2e4693f287669e84971c778bf071bd0526b.tar.xz
linux-e862f2e4693f287669e84971c778bf071bd0526b.zip
Merge tag 'sound-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
sound fixes #2 for 3.3-rc3 A collection of small fixes, mostly for regressions. In addition, a few ASoC wm8994 updates are included, too. * tag 'sound-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ASoC: wm8994: Disable line output discharge prior to ramping VMID ASoC: wm8994: Fix typo in VMID ramp setting ALSA: oxygen, virtuoso: fix exchanged L/R volumes of aux and CD inputs ALSA: usb-audio: add Edirol UM-3G support ALSA: hda - add support for Uniwill ECS M31EI notebook ALSA: hda - Fix error handling in patch_ca0132.c ASoC: wm8994: Enabling VMID should take a runtime PM reference ALSA: hda/realtek - Fix a wrong condition ALSA: emu8000: Remove duplicate linux/moduleparam.h include from emu8000_patch.c ALSA: hda/realtek - Add missing Bass and CLFE as vmaster slaves ASoC: wm_hubs: Correct line input to line output 2 paths ASoC: cs42l73: Fix Output [X|A|V]SP_SCLK Sourcing Mode setting for master mode ASoC: wm8962: Fix word length configuration ASoC: core: Better support for idle_bias_off suspend ignores ASoC: wm8994: Remove ASoC level register cache sync ASoC: wm_hubs: Fix routing of input PGAs to line output mixer
Diffstat (limited to 'include/keys')
0 files changed, 0 insertions, 0 deletions