| commit | 6f56c218666b5c7eff354364357307d18c10058b | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 28 Jul 2011 12:49:31 +0000 (28 05:49 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 28 Jul 2011 12:49:31 +0000 (28 05:49 -0700) | ||
| tree | 5c18d12d2410d25b0f8b5a2150e2f2f4df20e95b | treesnapshot (tar.gz zip) |
| parent | 95b6886526bb510b8370b625a49bc0ab3b8ff10f | commitdiff |
| parent | 8d34e6d3ec0393a286569587fbd9675abd258d93 | commitdiff |
Merge branch 'for-linus' of git://git./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
* '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