diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-10-08 09:30:04 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-10-08 09:30:04 +0200 |
commit | d820306cbe56fb010f500ae58f9725f49812d39a (patch) | |
tree | 1c9554107c7f279d05d6f54b1b5d69735d51195d /arch/mips/ralink/Kconfig | |
parent | ALSA: usb-audio: support wireless devices in snd_usb_parse_datainterval (diff) | |
parent | ALSA: hda - hdmi: Fix channel map switch not taking effect (diff) | |
download | linux-d820306cbe56fb010f500ae58f9725f49812d39a.tar.xz linux-d820306cbe56fb010f500ae58f9725f49812d39a.zip |
Merge branch 'for-linus' into for-next
For updating the HDMI chmap fix.
Conflicts:
sound/pci/hda/patch_hdmi.c
Diffstat (limited to 'arch/mips/ralink/Kconfig')
0 files changed, 0 insertions, 0 deletions