Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

Browse source

...

This commit is contained in:

David S. Miller 2010-02-19 12:45:20 -08:00

parent cf261b2392 64507fdbc2

commit 927606a17e

3 changed files with 15 additions and 14 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

include/linux/netfilter.h

View file

22

net/netfilter/nf_conntrack_netlink.c

View file

2

net/netfilter/nf_queue.c

View file