diff options
author | Mark Brown <broonie@kernel.org> | 2014-09-28 13:17:00 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-09-28 13:17:00 +0200 |
commit | fdaff15ae6cc8745b9b56adab0252729b476ed7e (patch) | |
tree | 182eb140d5c71501159fb0d46ffc8b74c766dc13 /include/rxrpc | |
parent | Merge remote-tracking branch 'regulator/topic/pwm' into regulator-drivers (diff) | |
parent | regulator: sky81452: Adding Skyworks SKY81452 regulator driver (diff) | |
download | linux-fdaff15ae6cc8745b9b56adab0252729b476ed7e.tar.xz linux-fdaff15ae6cc8745b9b56adab0252729b476ed7e.zip |
Merge remote-tracking branch 'regulator/topic/sky81452' into regulator-drivers
Conflicts:
drivers/regulator/Kconfig
drivers/regulator/Makefile
Diffstat (limited to 'include/rxrpc')
0 files changed, 0 insertions, 0 deletions