| commit | b37c0096b448d099d304bb47c4eada9117dba4cf | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Wed Nov 23 17:08:42 2011 +0100 |
| committer | Takashi Iwai <tiwai@suse.de> | Wed Nov 23 17:08:42 2011 +0100 |
| tree | c38f4c41874967a8f187e4c972b6365fb7a9f7cf | |
| parent | 8b940fc457fbf883053caf397586a61bd3cae23e [diff] | |
| parent | 61071594f64ed12328046f94716d1d744bddc0a1 [diff] |
Merge branch 'fix/hda' into topic/hda Conflicts: sound/pci/hda/patch_realtek.c