Merge branch 'master' into memleak-finder

[lttng-tools.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index d8c993ef52e2a596d458da250770c9f014c4e58f..5d1e2ffa03204d652d980477e1eca9b4da55b274 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -50,6 +50,8 @@ extras/core-handler/crash
 
 .checkpatch.conf
 
+!memleak/Makefile
+
 # Tests
 tests/unit/test_kernel_data
 tests/unit/test_session