diff --git a/[refs] b/[refs] index 8ad61d9eaa38..8fd48a202c7d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a3f86ec002774f28b9b3d1d5e5532231e96a0861 +refs/heads/master: aa8a9e25c5e865de85410be4e9269b552974f7a2 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 8e85429d3bb0..db6b351af2ae 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2171,6 +2171,12 @@ L: linux-rdma@vger.kernel.org S: Supported F: drivers/infiniband/hw/ehca/ +EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER +M: Breno Leitao +L: netdev@vger.kernel.org +S: Maintained +F: drivers/net/ehea/ + EMBEDDED LINUX M: Paul Gortmaker M: Matt Mackall