summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-04-12 00:09:18 +0200
committerMark Brown <broonie@kernel.org>2015-04-12 00:09:18 +0200
commit8afba181b90fbad372c420c302a57c0c4f9fdae4 (patch)
treecdbefe0c6f868baf7e78ace54598d6b6411eff30 /drivers/spi/spi.c
parentMerge remote-tracking branches 'spi/topic/fsl-cspi', 'spi/topic/fsl-dspi', 's... (diff)
parentspi/omap100k: Convert to runtime PM (diff)
parentspi: omap-uwire: Remove needless include asm/irq.h (diff)
parentspi: pl022: Remove dead code (diff)
parentspi: Remove support for legacy PM (diff)
parentspi: pxa2xx: missing break in pxa2xx_ssp_get_clk_div() (diff)
downloadlinux-8afba181b90fbad372c420c302a57c0c4f9fdae4.tar.xz
linux-8afba181b90fbad372c420c302a57c0c4f9fdae4.zip
Merge remote-tracking branches 'spi/topic/omap-100k', 'spi/topic/omap-uwire', 'spi/topic/pl022', 'spi/topic/pm' and 'spi/topic/pxa2xx' into spi-next