aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/scripts/python/bin
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-03-04 08:41:41 +0100
committerTakashi Iwai <tiwai@suse.de>2016-03-04 08:41:41 +0100
commit6defb60ae4ffe92c29291ed49695daa255b8f559 (patch)
tree67506a05d171df966b8ca9efa261fa307025e91e /tools/perf/scripts/python/bin
parentALSA: portman2x4: fix NULL pointer dereference (diff)
parentALSA: hda - hdmi defer to register acomp eld notifier (diff)
downloadlinux-6defb60ae4ffe92c29291ed49695daa255b8f559.tar.gz
linux-6defb60ae4ffe92c29291ed49695daa255b8f559.zip
Merge branch 'for-linus' into for-next
Resolved the conflicts with the latest HDA HDMI fixes. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'tools/perf/scripts/python/bin')
0 files changed, 0 insertions, 0 deletions