| commit | 75a287d9a35a825cb758d2f8d8df93d41f9f8e3e | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Fri Nov 21 08:27:04 2008 +0100 |
| committer | Takashi Iwai <tiwai@suse.de> | Fri Nov 21 08:27:04 2008 +0100 |
| tree | 7aacf881315a16695e35ca810434e42666d26a55 | |
| parent | 1725b82a6e2721612a3572d0336f51f1f1c3cf54 [diff] | |
| parent | 3a7abfd2ba26479615b81ac5e90d0122ef7f9fe0 [diff] |
Merge branch 'topic/fix/hda' into topic/hda Conflicts: sound/pci/hda/patch_sigmatel.c