diff options
author | Sean Paul <seanpaul@chromium.org> | 2018-09-27 09:54:54 +0300 |
---|---|---|
committer | Sean Paul <seanpaul@chromium.org> | 2018-09-27 09:54:54 +0300 |
commit | 7b76d0588477d4b6097a9048b42835a45caf5c48 (patch) | |
tree | fa4e0bcd49f8d17f26795224290c8f8460aa4116 /tools/testing/selftests/cgroup/.gitignore | |
parent | a74c0aa524050e5fd6c275a153b1f37283f6e37c (diff) | |
parent | bf78296ab1cb215d0609ac6cff4e43e941e51265 (diff) | |
download | linux-7b76d0588477d4b6097a9048b42835a45caf5c48.tar.xz |
Merge drm/drm-next into drm-misc-next
Backmerging 4.19-rc5 to pick up sun4i fix
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'tools/testing/selftests/cgroup/.gitignore')
-rw-r--r-- | tools/testing/selftests/cgroup/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/testing/selftests/cgroup/.gitignore b/tools/testing/selftests/cgroup/.gitignore index 95eb3a53c381..adacda50a4b2 100644 --- a/tools/testing/selftests/cgroup/.gitignore +++ b/tools/testing/selftests/cgroup/.gitignore @@ -1 +1,2 @@ test_memcontrol +test_core |