Pull battery into release branch

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

diff --git a/.gitignore b/.gitignore
index e1d5c17c12c22663d9df80925e4b7872bd53d6aa..a232295b99ac87331f375ce17c7e9bba5ea46d58 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,9 @@
 # Top-level generic files
 #
 tags
+TAGS
 vmlinux*
+!vmlinux.lds.S
 System.map
 Module.symvers
 
@@ -41,3 +43,9 @@ patches-*
 # quilt's files
 patches
 series
+
+# cscope files
+cscope.*
+
+*.orig
+*.rej