Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...

[linux-2.6-omap-h63xx.git] / .gitignore

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