aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/scripts/python
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-12-07 17:33:09 +0100
committerTakashi Iwai <tiwai@suse.de>2011-12-07 17:33:09 +0100
commitffe7e4063987678c00589717d7871f837c6e7300 (patch)
tree1aeee46780d9f7601909a4baa5f0c766c555e2e2 /tools/perf/scripts/python
parentMerge branch 'fix/hda' into topic/hda (diff)
parentALSA: hda/realtek - Fix lost speaker volume controls (diff)
downloadlinux-dev-ffe7e4063987678c00589717d7871f837c6e7300.tar.xz
linux-dev-ffe7e4063987678c00589717d7871f837c6e7300.zip
Merge branch 'fix/hda' into topic/hda
Conflicts: sound/pci/hda/patch_realtek.c
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions