James Bottomley 096cbc35ea Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-linus ... Conflicts: drivers/scsi/scsi_debug.c Agreed and tested resolution to a merge problem between a fix in scsi_debug and a driver update Signed-off-by: James Bottomley <JBottomley@Parallels.com>		2014-12-08 07:42:25 -08:00
..
block	Merge branch 'for-3.18/drivers' of git://git.kernel.dk/linux-block	2014-10-18 12:12:45 -07:00
char	s390/hmcdrv: Restrict s390 HMC driver to S390 arch	2014-10-15 16:56:26 +02:00
cio	Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2014-10-15 07:48:18 +02:00
crypto	s390/zcrypt: Toleration of new crypto hardware	2014-10-09 09:14:05 +02:00
kvm	KVM: s390: virtio_ccw: remove unused variable	2014-11-03 10:43:00 +01:00
net	Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-10-13 16:23:15 +02:00
scsi	scsi: drop reason argument from ->change_queue_depth	2014-11-24 14:45:27 +01:00
Makefile	[S390] split/move machine check handler code	2009-03-26 15:24:10 +01:00