summaryrefslogtreecommitdiffstats
path: root/drivers/parport
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-11-04 12:02:12 +0100
committerMark Brown <broonie@kernel.org>2015-11-04 12:02:12 +0100
commit4c84518523f888994c618585021c76fa499d465e (patch)
tree448a04c4507edb0e892a178b5e2a59c87044996c /drivers/parport
parentMerge remote-tracking branches 'spi/topic/fsl-dspi', 'spi/topic/mpc512x', 'sp... (diff)
parentspi: omap-100k: Rely on validations done by spi core (diff)
parentspi: omap-uwire: Remove needless bits_per_word and speed_hz tests (diff)
parentspi: Drop owner assignment from spi_drivers (diff)
parentspi: pxa2xx: Remove unused psp member variable from struct chip_data (diff)
parentspi: pxa2xx: Rework self-initiated platform data creation for non-ACPI (diff)
downloadlinux-4c84518523f888994c618585021c76fa499d465e.tar.xz
linux-4c84518523f888994c618585021c76fa499d465e.zip
Merge remote-tracking branches 'spi/topic/omap-100k', 'spi/topic/omap-uwire', 'spi/topic/owner', 'spi/topic/pxa' and 'spi/topic/pxa2xx' into spi-next