summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-07-20 18:02:08 +0100
committerMark Brown <broonie@kernel.org>2016-07-20 18:02:08 +0100
commita485f5fc8c8e631c32c65e5ee2bb5719400435d6 (patch)
treed65ab67745d091d4d07b5b7bcb3d1254b0a990e5 /fs
parent5f1aa35074fcc6cef7b2ad7f3a01a303e6dec9f1 (diff)
parent919163f6362ac23138d31fc8befdd52e5d7e488d (diff)
parent10d832d607c621c101922442f4771737296e1241 (diff)
parent3fb2ef111d6f799f3da8860c1a90ef3d9c36ea55 (diff)
parent2ac1ea2c4a8c714d8994ce35d0f6f9fec5e8cdc5 (diff)
Merge remote-tracking branches 'regulator/topic/qcom-spmi', 'regulator/topic/rn5t618', 'regulator/topic/tps65218' and 'regulator/topic/twl' into regulator-next