Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

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

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