summaryrefslogtreecommitdiffstats
path: root/drivers/spi/Makefile
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-06-18 01:19:53 +0200
committerMark Brown <broonie@kernel.org>2015-06-18 01:19:53 +0200
commitb9e2c097efe19c3c04ea3d84b295748e39e96c2b (patch)
treea52cecadb122dad57c525b2d3746db285ef77fb0 /drivers/spi/Makefile
parentMerge remote-tracking branches 'spi/topic/fsl-dspi', 'spi/topic/gpio', 'spi/t... (diff)
parentspi: pxa2xx: Constify ACPI device ids (diff)
parentspi: rb4xx: Fix checking return value of devm_ioremap_resource() (diff)
parentspi: rspi: Re-do the returning value of qspi_transfer_out_in (diff)
parentspi: s3c64xx: Constify platform_device_id (diff)
parentspi: sh-msiof: Constify platform_device_id (diff)
downloadlinux-b9e2c097efe19c3c04ea3d84b295748e39e96c2b.tar.xz
linux-b9e2c097efe19c3c04ea3d84b295748e39e96c2b.zip
Merge remote-tracking branches 'spi/topic/pxa', 'spi/topic/rb4xx', 'spi/topic/rspi', 'spi/topic/s3c64xx' and 'spi/topic/sh-msiof' into spi-next