| commit | e2da9ba570418fb4061f0a5cfe4338be6470c02b | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Sat Nov 15 19:05:21 2008 +0100 |
| committer | Takashi Iwai <tiwai@suse.de> | Sat Nov 15 19:05:21 2008 +0100 |
| tree | abdee28e90a5a911d0762286d729ea7f7d3cb65b | |
| parent | 127e82e3bfaad29e78ff5d4b1c41ab5e2d69c17f [diff] | |
| parent | c39555d6edd0142972f577405d5259879ecc1635 [diff] |
Merge branch 'topic/fix/hda' into topic/hda Conflicts: sound/pci/hda/patch_sigmatel.c