diff --git a/[refs] b/[refs] index a88f209aa00b..9110481b60a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b1960341576bf51c01b12fefeb1cc53820923e7 +refs/heads/master: 79461681692a337442c6a5cf44deba120a57186a diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 59203e77ce9e..d0bf2252e781 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -5160,6 +5160,14 @@ S: Maintained F: drivers/video/riva/ F: drivers/video/nvidia/ +NVM EXPRESS DRIVER +M: Matthew Wilcox +L: linux-nvme@lists.infradead.org +T: git git://git.infradead.org/users/willy/linux-nvme.git +S: Supported +F: drivers/block/nvme.c +F: include/linux/nvme.h + OMAP SUPPORT M: Tony Lindgren L: linux-omap@vger.kernel.org