summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/Makefile
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-06-02 18:08:05 +0200
committerMark Brown <broonie@linaro.org>2014-06-02 18:08:05 +0200
commit2c7a6a354794714da8aeaea0cf8fd162feb4a7a1 (patch)
treeab843f148bb4d9be975c75b15d1546a12b58fb1c /drivers/regulator/Makefile
parentMerge remote-tracking branches 'regulator/topic/arizona', 'regulator/topic/ax... (diff)
parentregulator: fixed: use of_property_read_{bool|u32}() (diff)
parentregulator: max8952: Make of_device_id array const (diff)
parentregulator: ltc3589: Remove ltc3589_list_voltage_fixed function (diff)
parentregulator: max8649: remove unnecessary OOM messages (diff)
parentregulator: use of_property_read_{bool|u32}() (diff)
downloadlinux-2c7a6a354794714da8aeaea0cf8fd162feb4a7a1.tar.xz
linux-2c7a6a354794714da8aeaea0cf8fd162feb4a7a1.zip
Merge remote-tracking branches 'regulator/topic/fixed', 'regulator/topic/id-const', 'regulator/topic/ltc3589', 'regulator/topic/max8649' and 'regulator/topic/of' into regulator-next