summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-05-29 16:05:05 +0200
committerIngo Molnar <mingo@elte.hu>2008-05-29 16:05:05 +0200
commit6715930654e06c4d2e66e718ea159079f71838f4 (patch)
tree6a0a19fb62f3e99cb5f6bf6c34ae541f7c30fb42 /.gitignore
parentea3f01f8afd3bc5daff915cc4ea5cc5ea9e7d427 (diff)
parente490517a039a99d692cb3a5561941b0a5f576172 (diff)
downloadkernel-crypto-6715930654e06c4d2e66e718ea159079f71838f4.tar.gz
kernel-crypto-6715930654e06c4d2e66e718ea159079f71838f4.tar.xz
kernel-crypto-6715930654e06c4d2e66e718ea159079f71838f4.zip
Merge commit 'linus/master' into sched-fixes-for-linus
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 090b293b877..d24ad506e79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,8 +52,8 @@ series
# cscope files
cscope.*
+ncscope.*
*.orig
-*.rej
*~
\#*#