Merge branch 'linux-2.6' into for-linus
[linux-2.6] / net / ipv4 / netfilter / nf_nat_amanda.c
2006-12-04  Paul MackerrasMerge branch 'linux-2.6' into for-linus
2006-12-03  Patrick McHardy[NETFILTER]: nf_conntrack/nf_nat: add amanda helper...