diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-09-21 09:06:42 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-09-21 09:06:42 +0200 |
| commit | 629b9111535f2a2607bbea1599d285a25f32835d (patch) | |
| tree | 81a37df4e13842d5ea3d54b619e929e2b6e9ffed /MAINTAINERS | |
| parent | usb: xhci: add debugfs support for ep with stream (diff) | |
| parent | Linux 5.9-rc6 (diff) | |
| download | linux-629b9111535f2a2607bbea1599d285a25f32835d.tar.xz linux-629b9111535f2a2607bbea1599d285a25f32835d.zip | |
Merge 5.0-rc6 into usb-next
We want the USB fixes in here, and this resolves a merge issue in the
uas driver.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e4cd87faae08..b1c3d0f975ef 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6180,7 +6180,7 @@ F: Documentation/devicetree/bindings/edac/aspeed-sdram-edac.txt F: drivers/edac/aspeed_edac.c EDAC-BLUEFIELD -M: Shravan Kumar Ramani <sramani@nvidia.com> +M: Shravan Kumar Ramani <shravankr@nvidia.com> S: Supported F: drivers/edac/bluefield_edac.c @@ -9251,7 +9251,7 @@ F: drivers/firmware/iscsi_ibft* ISCSI EXTENSIONS FOR RDMA (ISER) INITIATOR M: Sagi Grimberg <sagi@grimberg.me> -M: Max Gurtovoy <maxg@nvidia.com> +M: Max Gurtovoy <mgurtovoy@nvidia.com> L: linux-rdma@vger.kernel.org S: Supported W: http://www.openfabrics.org |