diff options
author | Mark Brown <broonie@kernel.org> | 2015-08-31 16:45:45 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-08-31 16:45:45 +0300 |
commit | c5992f610f78e6c9d0a78e8fef1066ad640e17e8 (patch) | |
tree | 85d5d6a169bd3832eeb64ba2f67892a88c3778aa /include/linux/ath9k_platform.h | |
parent | c92ec7c7ae99a371bbc69f0258888a0328ba4838 (diff) | |
parent | f682c4ffd25a19594d21987c19a69fa123242eb7 (diff) | |
parent | 98c7863c36bdf20c07e38d8bea5261902b52f98d (diff) | |
parent | bf9628373418328daf67b6508fc3713fc6f5067d (diff) | |
download | linux-c5992f610f78e6c9d0a78e8fef1066ad640e17e8.tar.xz |
Merge remote-tracking branches 'spi/topic/ti-qspi', 'spi/topic/xcomm' and 'spi/topic/xlp' into spi-next