git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f390dad 55a63d4)
Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Fri, 22 Mar 2013 13:53:25 +0000 (14:53 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 22 Mar 2013 13:53:25 +0000 (14:53 +0100)
Merge back for-linus branch for the badness table adjustment for VIA codecs

* for-linus:
  ALSA: hda - Fix DAC assignment for independent HP
  ALSA: hda - Fix abuse of snd_hda_lock_devices() for DSP loader
  ALSA: hda - Fix typo in checking IEC958 emphasis bit
  ALSA: snd-usb: mixer: ignore -EINVAL in snd_usb_mixer_controls()
  ALSA: snd-usb: mixer: propagate errors up the call chain
  ALSA: usb: Parse UAC2 extension unit like for UAC1
  ALSA: hda - Fix yet missing GPIO/EAPD setup in cirrus driver

1  2 
sound/pci/hda/hda_codec.c patch | diff1 | diff2 | blob | history
sound/pci/hda/hda_generic.c patch | diff1 | diff2 | blob | history

diff --cc sound/pci/hda/hda_codec.c
Simple merge
diff --cc sound/pci/hda/hda_generic.c
Simple merge
Pandora Kernel Repository