commit | eefe93b9957e6f14780b7d37aeda0f27f341953d | [log] [tgz] |
---|---|---|
author | Takashi Iwai <tiwai@suse.de> | Tue Nov 25 15:20:57 2008 +0100 |
committer | Takashi Iwai <tiwai@suse.de> | Tue Nov 25 15:20:57 2008 +0100 |
tree | 4b73293616abc911ead9d559a58b897885d7ad86 | |
parent | ee09543c866559e1ffb4f5c38533f2bedd725acd [diff] | |
parent | 661cd8fb5210af78f0763071642e0764a10389a6 [diff] |
Merge branch 'topic/fix/hda' into topic/hda Conflicts: sound/pci/hda/patch_sigmatel.c