summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-07-24 16:19:25 +0100
committerMark Brown <broonie@kernel.org>2015-07-24 16:19:25 +0100
commit4c7d83e8a8106d90d4eff971c8d070f718ac4f9c (patch)
tree7d4ff66f3bac9e8fab126c250221b5d914df0872 /drivers
parent7055a3145402bb3296cd98895da68462778f8b18 (diff)
parent322dfa6402ec08da1ca182ac0061a1cf2c5c3101 (diff)
parent127e10624232c5d605cad840d21af3b842541719 (diff)
parent32c848e33ace75fce388cceff76223d12b46eaa3 (diff)
parent36a1f1b6ddc6d1442424e29548e790633ca39c7b (diff)
downloadlinux-4c7d83e8a8106d90d4eff971c8d070f718ac4f9c.tar.bz2
Merge remote-tracking branches 'regulator/fix/88pm800', 'regulator/fix/max8973', 'regulator/fix/s2mps11' and 'regulator/fix/supply' into regulator-linus