tree 9707a27fb1eaa6d67e95b31504fbe49f06e52db3
parent af180b81a3f4ea925fae88878f367e676e99bf73
parent fa08a396647767abd24a9e7015cb177121d0cf15
author Linus Torvalds <torvalds@linux-foundation.org> 1371017241 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1371017241 -0700

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