diff options
| author | Mark Brown <broonie@kernel.org> | 2017-07-03 17:52:21 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-07-03 17:52:21 +0200 |
| commit | 8d67f64f7739464c352d4b167ed1748f3b2c1f44 (patch) | |
| tree | 5201724cb8188ba2af2193a43a73c83ab9eb0ec8 /scripts/kconfig/merge_config.sh | |
| parent | Merge remote-tracking branches 'regulator/topic/hi6421v530', 'regulator/topic... (diff) | |
| parent | regulator: Allow for asymmetric settling times (diff) | |
| parent | regulator: tps65910: wire up sleep control configuration (diff) | |
| parent | regulator: tps65917: Add support for SMPS12 (diff) | |
| download | linux-8d67f64f7739464c352d4b167ed1748f3b2c1f44.tar.xz linux-8d67f64f7739464c352d4b167ed1748f3b2c1f44.zip | |
Merge remote-tracking branches 'regulator/topic/settle', 'regulator/topic/tps65910' and 'regulator/topic/tps65917' into regulator-next