Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[pandora-kernel.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 090b293..d24ad50 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -52,8 +52,8 @@ series
 
 # cscope files
 cscope.*
+ncscope.*
 
 *.orig
-*.rej
 *~
 \#*#