Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

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

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