| commit | ce6dd5da9dfcf9232df09d8d486cd6ed25e29cdc | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Tue Nov 20 10:39:55 2012 +0900 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Tue Nov 20 10:39:55 2012 +0900 |
| tree | 5ab56a65bd6b52ae690b16d395c4d15599f43c7c | |
| parent | a5023574d120ca3b9337cedd4e27de90cae9aff7 [diff] | |
| parent | 64e481603ab46bcd1466fdaffca50f25bf123f83 [diff] |
Merge branch 'topic/tps6586x' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-hotplug Conflicts: drivers/regulator/tps6586x-regulator.c