| commit | 90d0be2fc33b4c4e11fc596da4736189be947d99 | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Wed Nov 12 10:02:04 2008 +0100 |
| committer | Takashi Iwai <tiwai@suse.de> | Wed Nov 12 10:02:04 2008 +0100 |
| tree | 0dd7e261f8d79d933c0a93c1a714b9a72fa05c28 | |
| parent | f43aa025b7de79d6a615ea4c1e6be7e6b1cea538 [diff] | |
| parent | d7a8943635485597ae7c6d554a8ccf3ce5a42d2d [diff] |
Merge branch 'topic/fix/hda' into topic/hda Conflicts: sound/pci/hda/patch_sigmatel.c