summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/Makefile
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-09-30 14:50:27 +0200
committerMark Brown <broonie@kernel.org>2014-09-30 14:50:27 +0200
commita81bf3c4fc391ec10696d448408c1ac83bfb6112 (patch)
tree470b98d273eda27fd10f86e2a628dbc938b8c05b /drivers/regulator/Makefile
parentMerge remote-tracking branches 'regulator/topic/as3711', 'regulator/topic/axp... (diff)
parentMerge remote-tracking branch 'regulator/topic/sky81452' into regulator-drivers (diff)
parentregulator: core: Add back the const qualifier for ops of struct regulator_desc (diff)
parentregulator: fan53555: Fix null pointer dereference (diff)
parentregulator: hi6421: Fix misleading comment (diff)
parentregulator: isl9305: REGULATOR_ISL9305 needs to select REGMAP_I2C (diff)
downloadlinux-a81bf3c4fc391ec10696d448408c1ac83bfb6112.tar.xz
linux-a81bf3c4fc391ec10696d448408c1ac83bfb6112.zip
Merge remote-tracking branches 'regulator/topic/drivers', 'regulator/topic/enable', 'regulator/topic/fan53555', 'regulator/topic/hi6421' and 'regulator/topic/isl9305' into regulator-next