diff options
author | Mark Brown <broonie@kernel.org> | 2017-02-19 16:41:17 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-02-19 16:41:17 +0000 |
commit | 57f22cd29cf1b4ff2aea8505eae2d3ed71ca5de4 (patch) | |
tree | bebce8a1fcf7419eb4f7442726bf13130354837b /drivers/w1 | |
parent | e2a3b0df8dea7585a2e64861f3ab7bcbc2a04386 (diff) | |
parent | 7abfe04c47d97243a7aeeb8fe211a15687bff67f (diff) | |
parent | 45e861a1c12cfd717b8e47103f1aaf2e34cc6688 (diff) | |
download | talos-obmc-linux-57f22cd29cf1b4ff2aea8505eae2d3ed71ca5de4.tar.gz talos-obmc-linux-57f22cd29cf1b4ff2aea8505eae2d3ed71ca5de4.zip |
Merge remote-tracking branches 'spi/topic/ti-qspi' and 'spi/topic/topcliff-pch' into spi-next