Merge remote-tracking branches 'regulator/topic/max77686', 'regulator/topic/max77693...
authorMark Brown <broonie@kernel.org>
Fri, 5 Dec 2014 11:14:37 +0000 (11:14 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 5 Dec 2014 11:14:37 +0000 (11:14 +0000)
commit92d07a8ff6e2e7844d1bce4e35c98c6a773d6f17
tree7829ab3771aa06c84438abbf9ba65b4a31d09e9a
parentaf012d6278d87ea612f2f9b74a0ffa75d2d92f20
parent0480395264fa361fc3feed05b26800debe026f57
parent2515b24c04ea5a1b770eee56ed1a946ab4350a42
parentff633bea47751f660aad1afd22790cbbd47ca9fc
parent0ce5b30763fb2a0e8cdc24311bb833003d35dc05
parent251ce318df3c07dbb3e484378a136a29e2f9bec1
Merge remote-tracking branches 'regulator/topic/max77686', 'regulator/topic/max77693', 'regulator/topic/max77802', 'regulator/topic/power-off' and 'regulator/topic/rk808' into regulator-next
drivers/regulator/anatop-regulator.c
drivers/regulator/arizona-ldo1.c
drivers/regulator/fixed.c
drivers/regulator/gpio-regulator.c
drivers/regulator/max77693.c
drivers/regulator/max8952.c
drivers/regulator/rk808-regulator.c
drivers/regulator/s5m8767.c
include/linux/of.h
include/linux/regulator/driver.h