diff --git a/[refs] b/[refs]
index 844a7dc44a00..e7707bfd10f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 591b0179e80f7d59b5e6e57063e92fdbface98fb
+refs/heads/master: 1f5d3a6b6532e25a5cdf1f311956b2b03d343a48
diff --git a/trunk/.gitignore b/trunk/.gitignore
index 090b293b8779..9c0d650385be 100644
--- a/trunk/.gitignore
+++ b/trunk/.gitignore
@@ -54,6 +54,5 @@ series
 cscope.*
 
 *.orig
-*.rej
 *~
 \#*#