diff --git a/[refs] b/[refs] index ea4461dc893b..10c087b4fb89 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ddb303301bed80f700db6f36870642a08016f266 +refs/heads/master: 2c46c9d5779d40e4a2f36f24017de4342344e258 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 13f472188e32..e443eb76ce5e 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -4822,6 +4822,14 @@ F: Documentation/scsi/megaraid.txt F: drivers/scsi/megaraid.* F: drivers/scsi/megaraid/ +MELLANOX ETHERNET DRIVER (mlx4_en) +M: Amir Vadai +L: netdev@vger.kernel.org +S: Supported +W: http://www.mellanox.com +Q: http://patchwork.ozlabs.org/project/netdev/list/ +F: drivers/net/ethernet/mellanox/mlx4/en_* + MEMORY MANAGEMENT L: linux-mm@kvack.org W: http://www.linux-mm.org