| commit | f291c74a32509d31731bb82cbb26c64cd430805b | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@kernel.org> | Fri Dec 05 11:06:18 2014 +0000 |
| committer | Mark Brown <broonie@kernel.org> | Fri Dec 05 11:06:18 2014 +0000 |
| tree | c19a8a22880a48a4a4b6eb91ba1a30dd62427f5e | |
| parent | 8b7daad3da2b36f5fe494f5d0c5ef25b33d56b96 [diff] | |
| parent | 5e5e3a42c653c5ef1c281651f1882411601129bd [diff] |
Merge branch 'topic/suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-sky81452 Conflicts: drivers/regulator/sky81452-regulator.c