diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-20 01:39:55 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-20 01:39:55 (GMT) |
| commit | ce6dd5da9dfcf9232df09d8d486cd6ed25e29cdc (patch) | |
| tree | 5ab56a65bd6b52ae690b16d395c4d15599f43c7c /drivers/ata | |
| parent | a5023574d120ca3b9337cedd4e27de90cae9aff7 (diff) | |
| parent | 64e481603ab46bcd1466fdaffca50f25bf123f83 (diff) | |
| download | linux-fsl-qoriq-ce6dd5da9dfcf9232df09d8d486cd6ed25e29cdc.tar.xz | |
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
Diffstat (limited to 'drivers/ata')
0 files changed, 0 insertions, 0 deletions