From: Linus Torvalds Date: Wed, 12 Jun 2013 06:07:21 +0000 (-0700) Subject: Merge branch 'fixes-3.10' of git://git.infradead.org/users/willy/linux-nvme X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=77293e215edef7871a39de4b326f777bc39278ca;p=linux-beck.git 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 --- 77293e215edef7871a39de4b326f777bc39278ca