summaryrefslogtreecommitdiff
path: root/drivers/w1
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-12-12 18:54:17 +0300
committerMark Brown <broonie@kernel.org>2016-12-12 18:54:17 +0300
commit669443013042f57ecdd912c26cbe2fa9687640bc (patch)
treefebdafeea54311a4bdc19168317757f3eea34742 /drivers/w1
parent830d705f26a73efccdc9c4ed686d86a959fe7291 (diff)
parent73482910587444c5600c9d6851ec056fc2ad38c0 (diff)
parent6906b0ec5cdef784102e7699807df140eeaba133 (diff)
parentdb30083813b559e98e10ae26bd09d3dc69be7fb7 (diff)
parentb099b1319d581243402d8dc56b4237d9928d00ca (diff)
downloadlinux-669443013042f57ecdd912c26cbe2fa9687640bc.tar.xz
Merge remote-tracking branches 'spi/topic/orion', 'spi/topic/pxa2xx', 'spi/topic/rspi' and 'spi/topic/s3c64xx' into spi-next