| commit | 09d3f6f1613f287b1d3ea7d2c9caf5b7aff70c99 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@kernel.org> | Fri Jan 09 18:03:55 2015 +0000 |
| committer | Mark Brown <broonie@kernel.org> | Fri Jan 09 18:03:55 2015 +0000 |
| tree | 9f2923e577ca25a38eb7e0bb9cdb9d762c9b809e | |
| parent | bfa21a0dfe6915dc85953b5d40ea9dae5fdf205f [diff] | |
| parent | 39138818a4f5c62d70f35504477c2509f982f211 [diff] |
Merge branch 'topic/core' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-dt-cb Conflicts: drivers/regulator/core.c