summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-02-09 08:10:19 +0100
committerMark Brown <broonie@kernel.org>2015-02-09 08:10:19 +0100
commit6e685ea6aaa3c578596ff8dbe6efde9485fc68f9 (patch)
tree391f1a7c0186f17d0ee2209073e910899f96fd76 /drivers/scsi/scsi.c
parentMerge remote-tracking branches 'asoc/topic/doc', 'asoc/topic/dwc', 'asoc/topi... (diff)
parentASoC: fsl_spdif: Use dev_name() for registering the irq (diff)
parentASoC: fsl: imx-spdif: Set the card owner field (diff)
parentASoC: Intel: fix platform_no_drv_owner.cocci warnings (diff)
parentASoC: jz4740: Add DT support to jz4740-i2s driver (diff)
parentASoC: max98357a: Fix build in !CONFIG_OF case (diff)
downloadlinux-6e685ea6aaa3c578596ff8dbe6efde9485fc68f9.tar.xz
linux-6e685ea6aaa3c578596ff8dbe6efde9485fc68f9.zip
Merge remote-tracking branches 'asoc/topic/fsl-spdif', 'asoc/topic/imx', 'asoc/topic/intel', 'asoc/topic/jz4740' and 'asoc/topic/max98357a' into asoc-next