diff options
author | Mark Brown <broonie@kernel.org> | 2016-12-12 18:54:17 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-12-12 18:54:17 +0300 |
commit | 669443013042f57ecdd912c26cbe2fa9687640bc (patch) | |
tree | febdafeea54311a4bdc19168317757f3eea34742 /drivers/w1 | |
parent | 830d705f26a73efccdc9c4ed686d86a959fe7291 (diff) | |
parent | 73482910587444c5600c9d6851ec056fc2ad38c0 (diff) | |
parent | 6906b0ec5cdef784102e7699807df140eeaba133 (diff) | |
parent | db30083813b559e98e10ae26bd09d3dc69be7fb7 (diff) | |
parent | b099b1319d581243402d8dc56b4237d9928d00ca (diff) | |
download | linux-669443013042f57ecdd912c26cbe2fa9687640bc.tar.xz |
Merge remote-tracking branches 'spi/topic/orion', 'spi/topic/pxa2xx', 'spi/topic/rspi' and 'spi/topic/s3c64xx' into spi-next