diff options
author | Mark Brown <broonie@kernel.org> | 2016-05-13 14:23:49 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-05-13 14:23:49 +0100 |
commit | 4f38c566a0967ce9291537ba04891391681a7661 (patch) | |
tree | 22bc983707a2ccc884d21fb3abbcc7b917c49465 | |
parent | 39d652e0660bbad6a90a21042dc9f22584dfaabd (diff) | |
parent | ae714c3b8e50a64d967188f3bc585bcd6a79539d (diff) | |
parent | 74d8b45fa344129b3dfd37019877ba68b1287e18 (diff) | |
download | op-kernel-dev-4f38c566a0967ce9291537ba04891391681a7661.zip op-kernel-dev-4f38c566a0967ce9291537ba04891391681a7661.tar.gz |
Merge remote-tracking branches 'regulator/topic/tps6524x' and 'regulator/topic/twl' into regulator-next