| commit | 5d6e6ffc400dbc3ea0cc58b8b6f9d9ac748d6572 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Wed Nov 28 19:24:48 2012 +0000 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Wed Nov 28 19:24:48 2012 +0000 |
| tree | f28c0307e82adf901277ae4e877dd2db7b620317 | |
| parent | bd0ec7c1e52423429d9ee7b34e2c899f01db01b0 [diff] | |
| parent | 9997f3ffbbcde01bcd5966eeb26bc41243715021 [diff] |
Merge branch 'topic/tps51632' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-min Conflicts: drivers/regulator/tps51632-regulator.c