summaryrefslogtreecommitdiff
path: root/sound/pci/hda/hda_proc.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-11-25 15:20:57 +0100
committerTakashi Iwai <tiwai@suse.de>2008-11-25 15:20:57 +0100
commiteefe93b9957e6f14780b7d37aeda0f27f341953d (patch)
tree4b73293616abc911ead9d559a58b897885d7ad86 /sound/pci/hda/hda_proc.c
parentee09543c866559e1ffb4f5c38533f2bedd725acd (diff)
parent661cd8fb5210af78f0763071642e0764a10389a6 (diff)
Merge branch 'topic/fix/hda' into topic/hda
Conflicts: sound/pci/hda/patch_sigmatel.c
Diffstat (limited to 'sound/pci/hda/hda_proc.c')
0 files changed, 0 insertions, 0 deletions