| commit | 0e19e7d2bff0ec04fe4dc920c580d8a321afa07f | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Tue Nov 25 11:56:25 2008 +0100 |
| committer | Takashi Iwai <tiwai@suse.de> | Tue Nov 25 11:56:25 2008 +0100 |
| tree | 9e784e7556a92172a0b27465e0b081437e44335e | |
| parent | 82894b6f6f109722070d4d78730fe50cdaba9443 [diff] | |
| parent | f73d35853e9263c7c404f0d6c0fe3d83fc6fd5c0 [diff] |
Merge branch 'topic/fix/hda' into topic/hda Conflicts: sound/pci/hda/patch_sigmatel.c