diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-12 02:07:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-12 02:07:21 -0400 |
| commit | 77293e215edef7871a39de4b326f777bc39278ca (patch) | |
| tree | 9707a27fb1eaa6d67e95b31504fbe49f06e52db3 /MAINTAINERS | |
| parent | af180b81a3f4ea925fae88878f367e676e99bf73 (diff) | |
| parent | fa08a396647767abd24a9e7015cb177121d0cf15 (diff) | |
Merge branch 'fixes-3.10' of git://git.infradead.org/users/willy/linux-nvme
Pull NVMe fixes from Matthew Wilcox.
* 'fixes-3.10' of git://git.infradead.org/users/willy/linux-nvme:
NVMe: Add MSI support
NVMe: Use dma_set_mask() correctly
Return the result from user admin command IOCTL even in case of failure
NVMe: Do not cancel command multiple times
NVMe: fix error return code in nvme_submit_bio_queue()
NVMe: check for integer overflow in nvme_map_user_pages()
MAINTAINERS: update NVM EXPRESS DRIVER file list
NVMe: Fix a signedness bug in nvme_trans_modesel_get_mp
NVMe: Remove redundant version.h header include
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0fda00f39849..0c9dc71a3d9f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -5766,7 +5766,7 @@ M: Matthew Wilcox <willy@linux.intel.com> | |||
| 5766 | L: linux-nvme@lists.infradead.org | 5766 | L: linux-nvme@lists.infradead.org |
| 5767 | T: git git://git.infradead.org/users/willy/linux-nvme.git | 5767 | T: git git://git.infradead.org/users/willy/linux-nvme.git |
| 5768 | S: Supported | 5768 | S: Supported |
| 5769 | F: drivers/block/nvme.c | 5769 | F: drivers/block/nvme* |
| 5770 | F: include/linux/nvme.h | 5770 | F: include/linux/nvme.h |
| 5771 | 5771 | ||
| 5772 | OMAP SUPPORT | 5772 | OMAP SUPPORT |