diff options
author | David S. Miller <davem@davemloft.net> | 2008-11-28 11:19:15 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-28 11:19:15 +0100 |
commit | ed77a89c30fa03dcb234a84ddea710b3fb7b62da (patch) | |
tree | 69f3e2c2bbf2fdd4f742e891441f01307d1d1f49 /arch/um | |
parent | decnet: compile fix for removal of byteorder wrapper (diff) | |
parent | netfilter: fix warning in net/netfilter/nf_conntrack_ftp.c (diff) | |
download | linux-ed77a89c30fa03dcb234a84ddea710b3fb7b62da.tar.xz linux-ed77a89c30fa03dcb234a84ddea710b3fb7b62da.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Conflicts:
net/netfilter/nf_conntrack_netlink.c
Diffstat (limited to 'arch/um')
0 files changed, 0 insertions, 0 deletions