Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[firefly-linux-kernel-4.4.55.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 090b293b87792a815cf51aeccb590ec37c90cfa3..9c0d650385bea274a551eae45b032f2cdfeb925b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -54,6 +54,5 @@ series
 cscope.*
 
 *.orig
-*.rej
 *~
 \#*#