| commit | e2da9ba570418fb4061f0a5cfe4338be6470c02b | |
| author | Takashi Iwai <tiwai@suse.de> | |
| Sat, 15 Nov 2008 18:05:21 +0000 (15 19:05 +0100) | ||
| committer | Takashi Iwai <tiwai@suse.de> | |
| Sat, 15 Nov 2008 18:05:21 +0000 (15 19:05 +0100) | ||
| tree | abdee28e90a5a911d0762286d729ea7f7d3cb65b | treesnapshot (tar.gz zip) |
| parent | 127e82e3bfaad29e78ff5d4b1c41ab5e2d69c17f | commitdiff |
| parent | c39555d6edd0142972f577405d5259879ecc1635 | commitdiff |
Merge branch 'topic/fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_sigmatel.c
Conflicts:
sound/pci/hda/patch_sigmatel.c
| sound/pci/hda/patch_sigmatel.c | diff1 | diff2 | blobhistory |