Linus Torvalds 2d4fe27850 Merge git://git.infradead.org/users/willy/linux-nvme ... Pull NVMe driver update from Matthew Wilcox: "Lots of exciting new features in the NVM Express driver this time, including support for emulating SCSI commands, discard support and the ability to submit per-sector metadata with I/Os. It's still mostly bugfixes though!" * git://git.infradead.org/users/willy/linux-nvme: (27 commits) NVMe: Use user defined admin ioctl timeout NVMe: Simplify Firmware Activate code slightly NVMe: Only clear the enable bit when disabling controller NVMe: Wait for device to acknowledge shutdown NVMe: Schedule timeout for sync commands NVMe: Meta-data support in NVME_IOCTL_SUBMIT_IO NVMe: Device specific stripe size handling NVMe: Split non-mergeable bio requests NVMe: Remove dead code in nvme_dev_add NVMe: Check for NULL memory in nvme_dev_add NVMe: Fix error clean-up on nvme_alloc_queue NVMe: Free admin queue on request_irq error NVMe: Add scsi unmap to SG_IO NVMe: queue usage fixes in nvme-scsi NVMe: Set TASK_INTERRUPTIBLE before processing queues NVMe: Add a character device for each nvme device NVMe: Fix endian-related problems in user I/O submission path NVMe: Fix I/O cancellation status on big-endian machines NVMe: Fix sparse warnings in scsi emulation NVMe: Don't fail initialisation unnecessarily ...		2013-05-09 16:35:00 -07:00
..
acpi
asm-generic
clocksource	ARM: late Exynos multiplatform changes	2013-05-07 11:28:42 -07:00
crypto
drm
dt-bindings
keys
linux	Merge git://git.infradead.org/users/willy/linux-nvme	2013-05-09 16:35:00 -07:00
math-emu
media
memory
misc
net
pcmcia
ras
rdma
rxrpc
scsi
sound
target
trace	f2fs updates for v3.10	2013-05-08 15:11:48 -07:00
uapi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2013-05-09 13:07:40 -07:00
video
xen
Kbuild