Jens Axboe b28bc9b38c Linux 3.13-rc6 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJSwLfoAAoJEHm+PkMAQRiGi6QH/1U1B7lmHChDTw3jj1lfm9gA 189Si4QJlnxFWCKHvKEL+pcaVuACU+aMGI8+KyMYK4/JfuWVjjj5fr/SvyHH2/8m LdSK8aHMhJ46uBS4WJ/l6v46qQa5e2vn8RKSBAyKm/h4vpt+hd6zJdoFrFai4th7 k/TAwOAEHI5uzexUChwLlUBRTvbq4U8QUvDu+DeifC8cT63CGaaJ4qVzjOZrx1an eP6UXZrKDASZs7RU950i7xnFVDQu4PsjlZi25udsbeiKcZJgPqGgXz5ULf8ZH8RQ YCi1JOnTJRGGjyIOyLj7pyB01h7XiSM2+eMQ0S7g54F2s7gCJ58c2UwQX45vRWU= =/4/R -----END PGP SIGNATURE----- Merge tag 'v3.13-rc6' into for-3.14/core Needed to bring blk-mq uptodate, since changes have been going in since for-3.14/core was established. Fixup merge issues related to the immutable biovec changes. Signed-off-by: Jens Axboe <axboe@kernel.dk> Conflicts: block/blk-flush.c fs/btrfs/check-integrity.c fs/btrfs/extent_io.c fs/btrfs/scrub.c fs/logfs/dev_bdev.c		2013-12-31 09:51:02 -07:00
..
Kconfig	[SCSI] libsas: convert to standard kernel debugging	2011-01-24 12:05:38 -06:00
Makefile	Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2011-03-20 18:14:55 -07:00
sas_ata.c	[SCSI] libsas: fix usage of ata_tf_to_fis	2013-11-27 11:01:07 +04:00
sas_discover.c	[SCSI] sas: unify the pointlessly separated enums sas_dev_type and sas_device_type	2013-05-10 07:47:52 -07:00
sas_dump.c	[SCSI] libsas: suspend / resume support	2012-08-24 13:10:23 +04:00
sas_dump.h	[SCSI] libsas: convert to standard kernel debugging	2011-01-24 12:05:38 -06:00
sas_event.c	[SCSI] libsas: suspend / resume support	2012-08-24 13:10:23 +04:00
sas_expander.c	block: Kill bio_segments()/bi_vcnt usage	2013-11-23 22:33:51 -08:00
sas_host_smp.c	SCSI updates on 20120319	2012-03-22 12:55:29 -07:00
sas_init.c	[SCSI] libsas: suspend / resume support	2012-08-24 13:10:23 +04:00
sas_internal.h	[SCSI] sas: unify the pointlessly separated enums sas_dev_type and sas_device_type	2013-05-10 07:47:52 -07:00
sas_phy.c	[SCSI] libsas: suspend / resume support	2012-08-24 13:10:23 +04:00
sas_port.c	[SCSI] sas: unify the pointlessly separated enums sas_dev_type and sas_device_type	2013-05-10 07:47:52 -07:00
sas_scsi_host.c	[SCSI] libsas: implement > 16 byte CDB support	2013-06-04 11:15:59 -07:00
sas_task.c	scsi: Add export.h for EXPORT_SYMBOL/THIS_MODULE as required	2011-10-31 19:31:23 -04:00