| commit | d1c3f7ca158e78fa78c9789d836d2a98d5fd25f3 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@kernel.org> | Sun Sep 28 12:14:26 2014 +0100 |
| committer | Mark Brown <broonie@kernel.org> | Sun Sep 28 12:14:26 2014 +0100 |
| tree | 30f11b3581cdab9f344bd6718a73988e7fc6a59c | |
| parent | 6a642509801116037720892efe72f0e84f02f317 [diff] | |
| parent | fbf7974427910a3f13fcb76a3493f9da0b141120 [diff] |
Merge remote-tracking branch 'regulator/topic/pwm' into regulator-drivers Conflicts: drivers/regulator/Kconfig