Merge branch 'bsg' of git://git.kernel.dk/data/git/linux-2.6-block

[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