diff options
author | Mark Brown <broonie@kernel.org> | 2014-12-08 13:17:20 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-12-08 13:17:20 +0100 |
commit | 0e647037fed5632e7c5989ec359ab84c676888ac (patch) | |
tree | e69061b2344fd5802b2fe12590c8e1588eaee3cb /drivers/ata/pata_macio.c | |
parent | Merge remote-tracking branches 'spi/topic/mxs', 'spi/topic/pxa', 'spi/topic/r... (diff) | |
parent | spi: spidev: Don't mangle max_speed_hz in underlying spi device (diff) | |
parent | spi/txx9: Deletion of an unnecessary check before the function call "clk_disa... (diff) | |
download | linux-0e647037fed5632e7c5989ec359ab84c676888ac.tar.xz linux-0e647037fed5632e7c5989ec359ab84c676888ac.zip |
Merge remote-tracking branches 'spi/topic/spidev' and 'spi/topic/txx9' into spi-next