aboutsummaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-04-15 13:19:04 -0400
committerDavid S. Miller <davem@davemloft.net>2012-04-15 13:19:04 -0400
commit56845d78cee8576a8160cee8aeac62efdb561ae2 (patch)
treef891afed5324d359da1713a80a7131968373acc4 /MAINTAINERS
parentdf8ef8f3aaa6692970a436204c4429210addb23a (diff)
parent8a9a0ea6032186e3030419262678d652b88bf6a8 (diff)
downloadlinux-56845d78cee8576a8160cee8aeac62efdb561ae2.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: drivers/net/ethernet/atheros/atlx/atl1.c drivers/net/ethernet/atheros/atlx/atl1.h Resolved a conflict between a DMA error bug fix and NAPI support changes in the atl1 driver. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 9ee96bbf79c..f1b5694340f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7572,8 +7572,8 @@ F: Documentation/filesystems/xfs.txt
F: fs/xfs/
XILINX AXI ETHERNET DRIVER
-M: Ariane Keller <ariane.keller@tik.ee.ethz.ch>
-M: Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch>
+M: Anirudha Sarangi <anirudh@xilinx.com>
+M: John Linn <John.Linn@xilinx.com>
S: Maintained
F: drivers/net/ethernet/xilinx/xilinx_axienet*