diff options
author | Mark Brown <broonie@kernel.org> | 2018-10-21 17:00:05 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-10-21 17:00:05 +0100 |
commit | f35b1e53a66ab06e6d04cdff96f686e8b88959ef (patch) | |
tree | ddbe31d784d4c8fa34a28f2b65df7df3ac0f5b97 /include/linux/alarmtimer.h | |
parent | 4fd1f509e89f0e8ea28b1baa41d314636ae2064e (diff) | |
parent | eb108c3611dd21d5d058cee25fec1c29baf5b0c9 (diff) | |
parent | db6565af68db17f6dbc26307a2768cb36e9f824a (diff) | |
download | talos-obmc-linux-f35b1e53a66ab06e6d04cdff96f686e8b88959ef.tar.gz talos-obmc-linux-f35b1e53a66ab06e6d04cdff96f686e8b88959ef.zip |
Merge remote-tracking branches 'regulator/topic/bd718xx' and 'regulator/topic/pfuze100' into regulator-next