summaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_macio.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-12-08 13:17:20 +0100
committerMark Brown <broonie@kernel.org>2014-12-08 13:17:20 +0100
commit0e647037fed5632e7c5989ec359ab84c676888ac (patch)
treee69061b2344fd5802b2fe12590c8e1588eaee3cb /drivers/ata/pata_macio.c
parentMerge remote-tracking branches 'spi/topic/mxs', 'spi/topic/pxa', 'spi/topic/r... (diff)
parentspi: spidev: Don't mangle max_speed_hz in underlying spi device (diff)
parentspi/txx9: Deletion of an unnecessary check before the function call "clk_disa... (diff)
downloadlinux-0e647037fed5632e7c5989ec359ab84c676888ac.tar.xz
linux-0e647037fed5632e7c5989ec359ab84c676888ac.zip
Merge remote-tracking branches 'spi/topic/spidev' and 'spi/topic/txx9' into spi-next