diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2012-11-19 21:25:27 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-11-19 21:25:27 +0100 |
| commit | 87af0b80c933f05a4c7dd8c5edebe10365e76220 (patch) | |
| tree | 6c33ab1a47b5f1ef196e8847586fb81b17152a0e /sound/usb/6fire | |
| parent | ALSA: hda - Fix Acer Aspire models with analog mics. (diff) | |
| parent | ALSA: hda - Limit runtime PM support only to known Intel chips (diff) | |
| download | linux-dev-87af0b80c933f05a4c7dd8c5edebe10365e76220.tar.xz linux-dev-87af0b80c933f05a4c7dd8c5edebe10365e76220.zip | |
Merge branch 'for-linus' into for-next
Merge the recent HD-audio codec change for fixing recursive suspend
calls.
Conflicts:
sound/pci/hda/hda_codec.c
Diffstat (limited to 'sound/usb/6fire')
0 files changed, 0 insertions, 0 deletions