summaryrefslogtreecommitdiff
path: root/drivers/misc
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-08-04 17:21:16 +0100
committerMark Brown <broonie@linaro.org>2014-08-04 17:21:16 +0100
commitfab6a0410d20ef09238ef54b8726d170578da752 (patch)
treeabe9c75d0e1e1057780b0614eb123f8c3d4315aa /drivers/misc
parent0c18b7638a11af1a7b6727162f1a4a362d4ac7bf (diff)
parente9d42d15275496a213709bbef5ba7b2f88263867 (diff)
parent5dabcf2f27ded864cf79204c4a3cca1516b66026 (diff)
parenta9082105b3ae682373e9aec2f2d87798f50e2a4f (diff)
Merge remote-tracking branches 'spi/topic/sh', 'spi/topic/sh-msiof' and 'spi/topic/topcliff-pch' into spi-next