| commit | 216c7a0f22a088ff9f7c14f82c5bf93294875df9 | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Tue Jun 21 07:34:00 2011 +0200 |
| committer | Takashi Iwai <tiwai@suse.de> | Tue Jun 21 07:34:45 2011 +0200 |
| tree | 2db768f30eac3aea06edff0bce5b3f9474bb5203 | |
| parent | ada509ec00e4ae1bfc4e0fa8a5c14091df920dbc [diff] | |
| parent | e905a83acd7bf8989c3d5ba3099b72675f5d7d29 [diff] |
Merge branch 'fix/hda' into topic/via-cleanup Conflicts: sound/pci/hda/patch_via.c