Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm

[sfrench/cifs-2.6.git] / tools / perf / .gitignore

diff --git a/tools/perf/.gitignore b/tools/perf/.gitignore
index e1d60d780784b8dd5ecedb42760a7802478276c1..cb43289e447f9d880b32ebadf173fa0f01aca166 100644 (file)
--- a/tools/perf/.gitignore
+++ b/tools/perf/.gitignore
@@ -18,3 +18,5 @@ perf-archive
 tags
 TAGS
 cscope*
+config.mak
+config.mak.autogen