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 060a71d41ad7ccc3214065a182e6f67568420071..8d15830b883d8f715b06aa5f028e5013d637acb3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,6 @@ series
 
 # cscope files
 cscope.*
+
+*.orig
+*.rej