Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

[linux-2.6] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3016ed3..9c0d650 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-*
@@ -53,6 +54,5 @@ series
 cscope.*
 
 *.orig
-*.rej
 *~
 \#*#