diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-12-06 22:39:39 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-12-06 22:39:39 +0100 |
commit | d6eabce2577a695197e9433302fd6a9f0e1a7666 (patch) | |
tree | e5c5bcc7803879d5d911cc8faeb74a946c242395 /tools/testing/selftests/timers/.gitignore | |
parent | Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent (diff) | |
parent | x86: don't hash faulting address in oops printout (diff) | |
download | linux-dev-d6eabce2577a695197e9433302fd6a9f0e1a7666.tar.xz linux-dev-d6eabce2577a695197e9433302fd6a9f0e1a7666.zip |
Merge branch 'linus' into perf/urgent, to synchronize UAPI headers
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/testing/selftests/timers/.gitignore')
-rw-r--r-- | tools/testing/selftests/timers/.gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/testing/selftests/timers/.gitignore b/tools/testing/selftests/timers/.gitignore index cc986621f512..2c8ac8416299 100644 --- a/tools/testing/selftests/timers/.gitignore +++ b/tools/testing/selftests/timers/.gitignore @@ -18,3 +18,5 @@ threadtest valid-adjtimex adjtick set-tz +freq-step +rtctest_setdate |