diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-16 23:21:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-16 23:21:24 -0400 |
| commit | da8120355e80ddaf534adb8ed910871d97512d56 (patch) | |
| tree | 9958a6c33e29b5af5faccf6650e98729151618a2 /MAINTAINERS | |
| parent | c86ae82605ef92594a0de809a8c588ae955fed63 (diff) | |
| parent | 7fefe6a88494b00b151b5ca7bb84daaa781bbca7 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/orinoco/main.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 381190c7949c..57ea97973349 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -4089,6 +4089,7 @@ L: netfilter@vger.kernel.org | |||
| 4089 | L: coreteam@netfilter.org | 4089 | L: coreteam@netfilter.org |
| 4090 | W: http://www.netfilter.org/ | 4090 | W: http://www.netfilter.org/ |
| 4091 | W: http://www.iptables.org/ | 4091 | W: http://www.iptables.org/ |
| 4092 | T: git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.git | ||
| 4092 | S: Supported | 4093 | S: Supported |
| 4093 | F: include/linux/netfilter* | 4094 | F: include/linux/netfilter* |
| 4094 | F: include/linux/netfilter/ | 4095 | F: include/linux/netfilter/ |