diff options
author | Mark Brown <broonie@kernel.org> | 2018-01-12 20:03:57 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-01-12 20:03:57 +0000 |
commit | 757b65285f366cb8d410333b03a502aab0c3689a (patch) | |
tree | 331248b3389f920c80a1ce404e4cdd419488444b /include/linux/regmap.h | |
parent | 86e41a2978d96aab854242a593682e594e146764 (diff) | |
parent | 8253bb3f82554cedb830a4cb65c84796df129c81 (diff) | |
parent | 46318b9784fb7b8363cc67bec24796b15dbba1e9 (diff) | |
parent | 3bafc09e779710abaa7b836fe3bbeeeab7754c2b (diff) | |
parent | 078711d7f88d33b0adebb402a1bcb2aa89afe68b (diff) |
Merge remote-tracking branches 'regmap/topic/const', 'regmap/topic/flat', 'regmap/topic/hwspinlock' and 'regmap/topic/nolock' into regmap-next