diff options
| author | Nathan Chancellor <natechancellor@gmail.com> | 2018-04-02 21:26:11 -0700 |
|---|---|---|
| committer | Nathan Chancellor <natechancellor@gmail.com> | 2018-04-02 21:26:11 -0700 |
| commit | e9c3f421e5087325bc73f1a7a8ca77ddf623f600 (patch) | |
| tree | 2f5d04d18dbbfe493a9adfff5ce75dbeb981f533 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | dbb643764069b058ea148af5923931d4d7093e7e (diff) | |
| parent | 03bf75e0bd8a3b41462e7518b247cbfaa50103fa (diff) | |
Merge branch 'android-msm-wahoo-4.4-oreo-m2' of https://github.com/android-linux-stable/wahoo into oreo-m2
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Conflicts:
drivers/media/v4l2-core/v4l2-compat-ioctl32.c
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions