Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jk/spufs into...

[linux-2.6] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3016ed30526d4296e219d4ea9dc3ef7e23fe9f23..d24ad506e799a5740d19913a333fc9d64261d9c7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,7 @@ include/linux/autoconf.h
 include/linux/compile.h
 include/linux/version.h
 include/linux/utsrelease.h
+include/linux/bounds.h
 
 # stgit generated dirs
 patches-*
@@ -51,8 +52,8 @@ series
 
 # cscope files
 cscope.*
+ncscope.*
 
 *.orig
-*.rej
 *~
 \#*#