forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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>
This commit is contained in:
Patrick McHardy 2010-04-20 16:02:01 +02:00
commit 6291055465
5616 changed files with 132602 additions and 35025 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/linux/kernel.h
View file

@ -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