diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-12-10 11:26:53 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-12-10 11:26:53 +0100 |
| commit | 46079bacb469c2eff15802fcccc88b0bd56b1e6e (patch) | |
| tree | 52f3cc4768b5e63f3efc1979a50c1abee505c6dc /tools/perf/scripts/python/bin | |
| parent | ALSA: hda/realtek - Enable headset button support for new codec (diff) | |
| parent | ALSA: hda/realtek: Enable audio jacks of ASUS UX433FN/UX333FA with ALC294 (diff) | |
| download | linux-46079bacb469c2eff15802fcccc88b0bd56b1e6e.tar.gz linux-46079bacb469c2eff15802fcccc88b0bd56b1e6e.zip | |
Merge branch 'for-linus' into for-next
Back-merge for resolving the conflict of fixup entries added in both
branches.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'tools/perf/scripts/python/bin')
0 files changed, 0 insertions, 0 deletions