Pull dock-bay into release branch

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

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