diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-28 14:49:31 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-28 14:49:31 +0200 |
commit | 6f56c218666b5c7eff354364357307d18c10058b (patch) | |
tree | 5c18d12d2410d25b0f8b5a2150e2f2f4df20e95b /sound/pci/es1968.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo... (diff) | |
parent | sound: oss: rename local change_bits to avoid powerpc bitsops.h definition (diff) | |
download | linux-6f56c218666b5c7eff354364357307d18c10058b.tar.xz linux-6f56c218666b5c7eff354364357307d18c10058b.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
sound: oss: rename local change_bits to avoid powerpc bitsops.h definition
ALSA: hda - Fix duplicated DAC assignments for Realtek
ALSA: asihpi - off by one in asihpi_hpi_ioctl()
ALSA: hda - Fix Oops with Realtek quirks with NULL adc_nids
ALSA: asihpi - bug fix pa use before init.
ALSA: hda - Add support for vref-out based mute LED control on IDT codecs
Diffstat (limited to 'sound/pci/es1968.c')
0 files changed, 0 insertions, 0 deletions