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