diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-16 20:34:50 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-16 20:34:50 -0400 |
| commit | 95aa1fe4abfc8d75dcd110bb285b09740214d053 (patch) | |
| tree | 668998047f77fe5d7f76ecbceec73a4f4c8311a6 /MAINTAINERS | |
| parent | b13bb2e9933b9dfa25c81d959d847c843481111e (diff) | |
| parent | 941297f443f871b8c3372feccf27a8733f6ce9e9 (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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 28c150e916a2..f608e1debdd9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -4044,6 +4044,7 @@ L: netfilter@vger.kernel.org | |||
| 4044 | L: coreteam@netfilter.org | 4044 | L: coreteam@netfilter.org |
| 4045 | W: http://www.netfilter.org/ | 4045 | W: http://www.netfilter.org/ |
| 4046 | W: http://www.iptables.org/ | 4046 | W: http://www.iptables.org/ |
| 4047 | T: git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.git | ||
| 4047 | S: Supported | 4048 | S: Supported |
| 4048 | F: include/linux/netfilter* | 4049 | F: include/linux/netfilter* |
| 4049 | F: include/linux/netfilter/ | 4050 | F: include/linux/netfilter/ |