Merge branch 'dmapool' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc

[sfrench/cifs-2.6.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 060a71d41ad7ccc3214065a182e6f67568420071..8363e48cdcdc67bad8834a08ec8dd57b8cb41635 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,14 +7,17 @@
 #
 .*
 *.o
+*.o.*
 *.a
 *.s
 *.ko
 *.so
+*.so.dbg
 *.mod.c
 *.i
 *.lst
 *.symtypes
+*.order
 
 #
 # Top-level generic files
@@ -22,8 +25,10 @@
 tags
 TAGS
 vmlinux*
+!vmlinux.lds.S
 System.map
 Module.symvers
+!.gitignore
 
 #
 # Generated include files
@@ -45,3 +50,6 @@ series
 
 # cscope files
 cscope.*
+
+*.orig
+*.rej