diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-27 20:08:14 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-27 20:08:14 +0000 |
| commit | 5979b2a35f0d67c09b385424674ece6ae9e3bda6 (patch) | |
| tree | a8efc084bab2277e71c2746eb27165a2022a1d1e | |
| parent | 9119ff6af541feee1daaa5cba3a4b3b5751a2d09 (diff) | |
| parent | 369cf602f364a60c72b8258c21eca8793939328f (diff) | |
| parent | 7bde76726fa296defc0eafc602284a7676817348 (diff) | |
Merge branches 'topic/da9055' and 'topic/tps51632' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-min