Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linvill...

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

diff --git a/.gitignore b/.gitignore
index 060a71d41ad7ccc3214065a182e6f67568420071..22fb8fa9bc3d283c829a7d7ce6da13a6db59262e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 #
 .*
 *.o
+*.o.*
 *.a
 *.s
 *.ko
@@ -22,8 +23,10 @@
 tags
 TAGS
 vmlinux*
+!vmlinux.lds.S
 System.map
 Module.symvers
+!.gitignore
 
 #
 # Generated include files
@@ -45,3 +48,6 @@ series
 
 # cscope files
 cscope.*
+
+*.orig
+*.rej