diff options
author | Mark Brown <broonie@kernel.org> | 2016-10-29 20:14:39 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-10-29 20:14:39 +0200 |
commit | 74e3368de87d5efb439b17d8e5108ebaf08224c2 (patch) | |
tree | bd3cbeb021459e15ff25c4689bd29fa4fb13deeb /include | |
parent | Linux 4.9-rc2 (diff) | |
parent | regmap: include <linux/delay.h> from include/linux/regmap.h (diff) | |
parent | regmap: Rename ret variable in regmap_read_poll_timeout (diff) | |
download | linux-74e3368de87d5efb439b17d8e5108ebaf08224c2.tar.xz linux-74e3368de87d5efb439b17d8e5108ebaf08224c2.zip |
Merge remote-tracking branches 'regmap/fix/header' and 'regmap/fix/macro' into regmap-linus