diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-12-20 15:42:57 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-12-20 15:42:57 +0100 |
commit | 78c058df6a120044455b5635daefdc515bf9d899 (patch) | |
tree | d349e70e384404a9a2d9860feb0219e9f8acb212 /firmware | |
parent | db9c6f842fa957b41984cd8ceea1f07c53fb3fbf (diff) | |
parent | 31ef22579302ac42054bebecb528710f46580925 (diff) | |
download | kernel_goldelico_gta04-78c058df6a120044455b5635daefdc515bf9d899.zip kernel_goldelico_gta04-78c058df6a120044455b5635daefdc515bf9d899.tar.gz kernel_goldelico_gta04-78c058df6a120044455b5635daefdc515bf9d899.tar.bz2 |
Merge branch 'test/hda-jack' into topic/hda
Conflicts:
sound/pci/hda/patch_hdmi.c
sound/pci/hda/patch_via.c
Diffstat (limited to 'firmware')
0 files changed, 0 insertions, 0 deletions