summaryrefslogtreecommitdiffstats
path: root/drivers/ide/rz1000.c
diff options
context:
space:
mode:
authorMark Brown2014-01-23 14:07:09 +0100
committerMark Brown2014-01-23 14:07:09 +0100
commit907e26b6f52004ecec152f5650b5dc687aed7157 (patch)
tree6db598a582837ee1021a384ccef739937dfaed64 /drivers/ide/rz1000.c
parentMerge remote-tracking branches 'spi/topic/bcm2835', 'spi/topic/bcm63xx', 'spi... (diff)
parentspi/fsl-espi: Add Power Management support for eSPI controller (diff)
parentspi: gpio: clarify gpio chipselect language (diff)
parentspi: sh-hspi: Spelling s/recive/receive/ (diff)
parentspi: mpc512x: Use devm_*() functions (diff)
parentspi: spi-sh-msiof: set hi/low Active for HW CS (diff)
parentspi: nuc900: Cleanup spi-nuc900.h header (diff)
parentspi: oc-tiny: Simplify tiny_spi_txrx_bufs implementation when irq is not used (diff)
parentspi: omap-100k: remove pointless _remove function (diff)
parentspi: orion: Use devm_clk_get() (diff)
parentspi: remove DEFINE_PCI_DEVICE_TABLE macro (diff)
downloadkernel-qcow2-linux-907e26b6f52004ecec152f5650b5dc687aed7157.tar.gz
kernel-qcow2-linux-907e26b6f52004ecec152f5650b5dc687aed7157.tar.xz
kernel-qcow2-linux-907e26b6f52004ecec152f5650b5dc687aed7157.zip
Merge remote-tracking branches 'spi/topic/fsl-espi', 'spi/topic/gpio', 'spi/topic/hspi', 'spi/topic/mpc512x', 'spi/topic/msiof', 'spi/topic/nuc900', 'spi/topic/oc-tiny', 'spi/topic/omap', 'spi/topic/orion' and 'spi/topic/pci' into spi-linus