diff options
| author | Mark Brown <broonie@linaro.org> | 2014-02-12 11:47:33 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-02-12 11:47:33 +0000 |
| commit | 5c306c8ab5dac69714f6e38bed95cfb6bd7758ed (patch) | |
| tree | 9b955b4a868a9155764579fbf9b02aace3e66733 /fs | |
| parent | b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed (diff) | |
| parent | f17083c3affccfe955b0a419056784096c18fea8 (diff) | |
| parent | 667a6b7a620ec6e0c1e6689b8c6531c51ce6cdfa (diff) | |
Merge remote-tracking branches 'regulator/fix/da9055' and 'regulator/fix/max14577' into regulator-linus