diff options
author | Mark Brown <broonie@kernel.org> | 2015-09-04 17:22:10 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-09-04 17:22:10 +0100 |
commit | 072502a67c9164625288cca17704808e6c06273f (patch) | |
tree | 00a51dbbca25062a60a13154b1654b91872daa56 /drivers/thermal | |
parent | 84fb9015d20dc12a2d36f7d775700a53cc45ad90 (diff) | |
parent | 1ed8111443ae8caa455e7107031da36d1a6d351a (diff) | |
parent | 2de9d6006c190bb0f706e8404de94cd94293801f (diff) | |
download | op-kernel-dev-072502a67c9164625288cca17704808e6c06273f.zip op-kernel-dev-072502a67c9164625288cca17704808e6c06273f.tar.gz |
Merge remote-tracking branches 'regmap/topic/lockdep' and 'regmap/topic/seq-delay' into regmap-next