projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
[linux-2.6-microblaze.git]
/
MAINTAINERS
diff --git
a/MAINTAINERS
b/MAINTAINERS
index
606d1f8
..
a75f847
100644
(file)
--- a/
MAINTAINERS
+++ b/
MAINTAINERS
@@
-10866,7
+10866,7
@@
F: drivers/net/ethernet/neterion/
NETFILTER
M: Pablo Neira Ayuso <pablo@netfilter.org>
-M: Jozsef Kadlecsik <kadlec@
blackhole.kfki.hu
>
+M: Jozsef Kadlecsik <kadlec@
netfilter.org
>
M: Florian Westphal <fw@strlen.de>
L: netfilter-devel@vger.kernel.org
L: coreteam@netfilter.org