x86: automatical unification of i8259.c

[safe/jmp/linux-2.6] / .gitignore

diff --git a/.gitignore b/.gitignore
index 8d14531..9c0d650 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@
 *.i
 *.lst
 *.symtypes
+*.order
 
 #
 # Top-level generic files
@@ -26,6 +27,7 @@ TAGS
 vmlinux*
 !vmlinux.lds.S
 System.map
+Module.markers
 Module.symvers
 !.gitignore
 
@@ -39,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,4 +54,5 @@ series
 cscope.*
 
 *.orig
-*.rej
+*~
+\#*#