diff --git a/[refs] b/[refs]
index 20b904a73b63..8de243536b0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c681b43fae1e402e39d157feaa5df454b9e4f1f
+refs/heads/master: a5d292646ebf2ee51086f59899a377c85e5d50b2
diff --git a/trunk/net/netfilter/nf_conntrack_standalone.c b/trunk/net/netfilter/nf_conntrack_standalone.c
index ffb6ff8c3528..f752293940f9 100644
--- a/trunk/net/netfilter/nf_conntrack_standalone.c
+++ b/trunk/net/netfilter/nf_conntrack_standalone.c
@@ -181,7 +181,7 @@ static int ct_seq_show(struct seq_file *s, void *v)
 
 	if (seq_printf(s, "use=%u\n", atomic_read(&conntrack->ct_general.use)))
 		return -ENOSPC;
-	
+
 	return 0;
 }
 
diff --git a/trunk/net/netfilter/nf_log.c b/trunk/net/netfilter/nf_log.c
index 94985792b79a..d67c4fbf6031 100644
--- a/trunk/net/netfilter/nf_log.c
+++ b/trunk/net/netfilter/nf_log.c
@@ -9,7 +9,7 @@
 
 #include "nf_internals.h"
 
-/* Internal logging interface, which relies on the real 
+/* Internal logging interface, which relies on the real
    LOG target modules */
 
 #define NF_LOG_PREFIXLEN		128