diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-05-27 18:48:01 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-05-27 18:48:01 -0700 |
| commit | c114dc5e5bb3e6b7cf72005ea2fc0a54097cab19 (patch) | |
| tree | 6c7ec7cea037f66b9beea02636b02aba7c0e9164 /tools/perf/scripts/python/net_dropmonitor.py | |
| parent | b62f97634aa9f61efb8e0935658c758140680c84 (diff) | |
| parent | 7c7da40da1640ce6814dab1e8031b44e19e5a3f6 (diff) | |
Merge branch 'for-linus' into next
Sync up with 'for-linus' branch to avoid merge conflicts with following
patches to Elan touchpad drivers.
Diffstat (limited to 'tools/perf/scripts/python/net_dropmonitor.py')
0 files changed, 0 insertions, 0 deletions