diff options
| author | Sean Paul <seanpaul@chromium.org> | 2017-07-26 18:39:07 -0400 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2017-07-26 18:39:07 -0400 |
| commit | 78acea381d6eb1c67b155e7e2638ba3b1728eb07 (patch) | |
| tree | 323b89e2f43f5f177223aeb61a6a18fe12eda011 /tools/perf/scripts/python/net_dropmonitor.py | |
| parent | drm/bridge: Add a devm_ allocator for panel bridge. (diff) | |
| parent | drm: linux-next: build failure after merge of the drm-misc tree (diff) | |
| download | linux-78acea381d6eb1c67b155e7e2638ba3b1728eb07.tar.gz linux-78acea381d6eb1c67b155e7e2638ba3b1728eb07.zip | |
Merge airlied/drm-next into drm-misc-next
Backmerge drm-next with -rc2 in it to pull in a couple stm patches that
were previously incorrectly applied to -misc-next. By picking them up in
the correct manner, git will hopefully fix any errant trees that are out
in the wild.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'tools/perf/scripts/python/net_dropmonitor.py')
0 files changed, 0 insertions, 0 deletions