| commit | fdaff15ae6cc8745b9b56adab0252729b476ed7e | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@kernel.org> | Sun Sep 28 12:17:00 2014 +0100 |
| committer | Mark Brown <broonie@kernel.org> | Sun Sep 28 12:17:00 2014 +0100 |
| tree | 182eb140d5c71501159fb0d46ffc8b74c766dc13 | |
| parent | d1c3f7ca158e78fa78c9789d836d2a98d5fd25f3 [diff] | |
| parent | 9839d627c2a2c74facde9a9ee949f2ba0a1363b1 [diff] |
Merge remote-tracking branch 'regulator/topic/sky81452' into regulator-drivers Conflicts: drivers/regulator/Kconfig drivers/regulator/Makefile