Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[cascardo/linux.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 060a71d..8d15830 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,6 @@ series
 
 # cscope files
 cscope.*
+
+*.orig
+*.rej