diff options
author | Mark Brown <broonie@kernel.org> | 2015-03-16 11:43:24 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-03-16 11:43:24 +0000 |
commit | 8ca8f32666d2a655e274836400e1a7f7fa313502 (patch) | |
tree | 08be968aeda653fe1d7b1c7bbb90a4511d264525 | |
parent | 06e5801b8cb3fc057d88cb4dc03c0b64b2744cda (diff) | |
parent | 29d62ec5f87fbeec8413e2215ddad12e7f972e4c (diff) | |
parent | d16da513c9c8f394216b8dd7c258e667b2c43c74 (diff) |
Merge remote-tracking branches 'regulator/fix/gpio-enable' and 'regulator/fix/tps65910' into regulator-linus