summary refs log tree commit diff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-03-22 16:43:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-03-22 16:43:53 -0700
commit5da273fe3fd137c6ae4acf74b7449500f5e4dc09 (patch)
treee49a4f7b5fb24a2bb8a4d0945f3981d5edff93df /MAINTAINERS
parent14629ed31467741d12f342c95621900646173519 (diff)
parent122090366d1d5c6ec1bfb6dfdb3a6d121ff074aa (diff)
downloadlinux-5da273fe3fd137c6ae4acf74b7449500f5e4dc09.tar.gz
Merge git://git.infradead.org/users/willy/linux-nvme
Pull NVMe driver update from Matthew Wilcox:
 "These patches have mostly been baking for a few months; sorry I didn't
  get them in during the merge window.  They're all bug fixes, except
  for the addition of the SMART log and the addition to MAINTAINERS."

* git://git.infradead.org/users/willy/linux-nvme:
  NVMe: Add namespaces with no LBA range feature
  MAINTAINERS: Add entry for the NVMe driver
  NVMe: Initialize iod nents to 0
  NVMe: Define SMART log
  NVMe: Add result to nvme_get_features
  NVMe: Set result from user admin command
  NVMe: End queued bio requests when freeing queue
  NVMe: Free cmdid on nvme_submit_bio error
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS8
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index ce424d7520f5..25e3bd54d94a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5641,6 +5641,14 @@ S:	Maintained
 F:	drivers/video/riva/
 F:	drivers/video/nvidia/
 
+NVM EXPRESS DRIVER
+M:	Matthew Wilcox <willy@linux.intel.com>
+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 <tony@atomide.com>
 L:	linux-omap@vger.kernel.org