summaryrefslogtreecommitdiffstats
path: root/tools/testing/selftests/timers/.gitignore
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2017-01-24 12:37:43 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-01-24 12:37:43 -0800
commit0cce284537fb42d9c28b9b31038ffc9b464555f5 (patch)
treee7af3b5fe2d04ef6527b5da50851d498ee13184e /tools/testing/selftests/timers/.gitignore
parentcefb26d4b37c329f624eb235a1bdc7b6b8dd9430 (diff)
parent7a308bb3016f57e5be11a677d15b821536419d36 (diff)
downloadblackbird-obmc-linux-0cce284537fb42d9c28b9b31038ffc9b464555f5.tar.gz
blackbird-obmc-linux-0cce284537fb42d9c28b9b31038ffc9b464555f5.zip
Merge tag 'v4.10-rc5' into next
Sync up with mainline to bring up improvements in various subsystems.
Diffstat (limited to 'tools/testing/selftests/timers/.gitignore')
-rw-r--r--tools/testing/selftests/timers/.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/testing/selftests/timers/.gitignore b/tools/testing/selftests/timers/.gitignore
index 68f3fc71ac44..cc986621f512 100644
--- a/tools/testing/selftests/timers/.gitignore
+++ b/tools/testing/selftests/timers/.gitignore
@@ -17,3 +17,4 @@ skew_consistency
threadtest
valid-adjtimex
adjtick
+set-tz
OpenPOWER on IntegriCloud