Merge branch 'master' of /repos/git/linux-2.6 (f790c0ca) · Commits · github.com / kvm-riscv / linux

Commit f790c0ca authored Mar 08, 2010 by

Patrick McHardy

Merge branch 'master' of /repos/git/linux-2.6



Conflicts:
	net/ipv4/netfilter/nf_nat_core.c
	net/netfilter/nf_conntrack_core.c
	net/netfilter/nf_conntrack_netlink.c

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

parents 9ab48ddc 25cf84cf

Hide whitespace changes

Inline Side-by-side

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment