summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/max8997.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-12-05 11:14:35 +0000
committerMark Brown <broonie@kernel.org>2014-12-05 11:14:35 +0000
commitaf012d6278d87ea612f2f9b74a0ffa75d2d92f20 (patch)
tree2a1978f2295fe6d4b9243294f734a8e7b439b611 /drivers/regulator/max8997.c
parent15db0c8d79b353e4a5b62aef6863ffac4b36cf8d (diff)
parentda0607c8df5c6277ff75468f24e055f193b6b336 (diff)
parenta1c8a5512b7cddc81767172f0de37b155cea039f (diff)
parente1326eff80bffc43ef766c0262d1ce9375c2f610 (diff)
parent9f946099fe1927aa746892232c4421e1ae175699 (diff)
Merge remote-tracking branches 'regulator/topic/anatop', 'regulator/topic/disable', 'regulator/topic/dummy' and 'regulator/topic/gpio' into regulator-next