Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

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

diff --git a/.gitignore b/.gitignore
index 9eb4b77114994877b247c1d165f3920f680cc7e6..8d15830b883d8f715b06aa5f028e5013d637acb3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,9 @@ patches-*
 # quilt's files
 patches
 series
+
+# cscope files
+cscope.*
+
+*.orig
+*.rej