diff options
| author | David S. Miller <davem@davemloft.net> | 2011-08-30 17:43:56 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-30 17:43:56 -0400 |
| commit | 785824165508a65478474f0c87f6b8c3ad048c62 (patch) | |
| tree | 2b3ef81b4439cf682638aa504e29f37ef2b6da96 /MAINTAINERS | |
| parent | ec0506dbe4e240ecd4c32bf74c84a88ce1ddb414 (diff) | |
| parent | 768b1031dc9f3eabe3e9f603e33617a0215c12a8 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 28f65c249b97..261232d8adf9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -4404,7 +4404,8 @@ L: netfilter@vger.kernel.org | |||
| 4404 | L: coreteam@netfilter.org | 4404 | L: coreteam@netfilter.org |
| 4405 | W: http://www.netfilter.org/ | 4405 | W: http://www.netfilter.org/ |
| 4406 | W: http://www.iptables.org/ | 4406 | W: http://www.iptables.org/ |
| 4407 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.git | 4407 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-2.6.git |
| 4408 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next-2.6.git | ||
| 4408 | S: Supported | 4409 | S: Supported |
| 4409 | F: include/linux/netfilter* | 4410 | F: include/linux/netfilter* |
| 4410 | F: include/linux/netfilter/ | 4411 | F: include/linux/netfilter/ |