| commit | ffe7e4063987678c00589717d7871f837c6e7300 | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Wed Dec 07 17:33:09 2011 +0100 |
| committer | Takashi Iwai <tiwai@suse.de> | Wed Dec 07 17:33:09 2011 +0100 |
| tree | 1aeee46780d9f7601909a4baa5f0c766c555e2e2 | |
| parent | 9eb6e9b16f86ef94f05427bd7fc84d521aa57169 [diff] | |
| parent | 0a34b42b6245ccc710be6759cded5b7fe41ea1f9 [diff] |
Merge branch 'fix/hda' into topic/hda Conflicts: sound/pci/hda/patch_realtek.c