| commit | cd80bc6f4811b48eb68716c8255bf7e5f0006caa | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Thu Nov 13 14:38:00 2008 +0100 |
| committer | Takashi Iwai <tiwai@suse.de> | Thu Nov 13 14:38:00 2008 +0100 |
| tree | 9b5f495d1bd33f4bbf3b23765188d3be72f38415 | |
| parent | c4da29ca08e09ed41a2030c1f7b5860f116573be [diff] | |
| parent | 6a12afb5640217454cad21e8cf9a74b038fa3717 [diff] |
Merge branch 'topic/fix/hda' into topic/hda Conflicts: sound/pci/hda/patch_sigmatel.c