| commit | 87af0b80c933f05a4c7dd8c5edebe10365e76220 | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Mon Nov 19 21:25:27 2012 +0100 |
| committer | Takashi Iwai <tiwai@suse.de> | Mon Nov 19 21:25:27 2012 +0100 |
| tree | 6c33ab1a47b5f1ef196e8847586fb81b17152a0e | |
| parent | 08a978db518dfceb37998bc74a7fed03540cfd08 [diff] | |
| parent | 2ea3c6a2c779e5a6487d2b436770232162dfbbe3 [diff] |
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