Merge branch 'master' of /repos/git/net-next-2.6

Conflicts:
	Documentation/feature-removal-schedule.txt
	net/ipv6/netfilter/ip6t_REJECT.c
	net/netfilter/xt_limit.c

Signed-off-by: Patrick McHardy <kaber@trash.net>

1 files changed, 1 insertions, 1 deletions

diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index db6717d0fd6f..a38d6bd6fde6 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -428,7 +428,7 @@ static inline char *pack_hex_byte(char *buf, u8 byte)
                 .burst = DEFAULT_RATELIMIT_BURST,       \
         };                                              \
                                                         \
-        if (!__ratelimit(&_rs))                         \
+        if (__ratelimit(&_rs))                          \
                 printk(fmt, ##__VA_ARGS__);             \
 })
 #else