diff options
author | Mark Brown <broonie@linaro.org> | 2013-12-11 22:54:38 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-12-11 22:54:38 +0000 |
commit | 67cc6885548427a4f7980b57e6ef32945f6d22b1 (patch) | |
tree | 106a25e19dac241730b0e348c015a10b3849e6bf | |
parent | 374b105797c3d4f29c685f3be535c35f5689b30e (diff) | |
parent | 6389075eff7dc1e6db39203c968394486c13b3e2 (diff) | |
parent | 236c427cbc990e03ec8b39ce8ee9220705daeff9 (diff) |
Merge remote-tracking branches 'regulator/fix/as3722' and 'regulator/fix/pfuze100' into regulator-linus