diff options
| author | Takashi Iwai <[email protected]> | 2015-06-12 08:10:20 +0200 |
|---|---|---|
| committer | Takashi Iwai <[email protected]> | 2015-06-12 08:10:20 +0200 |
| commit | cc1b76ed32607ba378986931e73b64231085816f (patch) | |
| tree | 2554500c3e743249afafd1857a3956aae1b2220e /tools/perf/util/scripting-engines/trace-event-perl.c | |
| parent | 9e8af74c38162c884465385a7f1ded1c98cdc752 (diff) | |
| parent | 535115b5ff51c702a9a22feb918707c2fe1fbd17 (diff) | |
Merge branch 'for-linus' into for-next
Yet another non-trivial conflicts resolution for the recent HD-audio fix.
Conflicts:
sound/pci/hda/hda_intel.c
Signed-off-by: Takashi Iwai <[email protected]>
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-perl.c')
0 files changed, 0 insertions, 0 deletions