summaryrefslogtreecommitdiff
path: root/drivers/regulator/Makefile
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-06-02 17:08:05 +0100
committerMark Brown <broonie@linaro.org>2014-06-02 17:08:05 +0100
commit2c7a6a354794714da8aeaea0cf8fd162feb4a7a1 (patch)
treeab843f148bb4d9be975c75b15d1546a12b58fb1c /drivers/regulator/Makefile
parent8ff15e0909e3e369c0ba8037901bb76ba5d82d47 (diff)
parent4127f696f9641afac8b8a05b9dd3dae48d384e08 (diff)
parentcfe6e3334eea1f4539799159e2b6024ae7f71a0d (diff)
parentc0c14e6af9ec89479f3ee3895961ef51e97aadd4 (diff)
parent6e27e99613b36e68bdbee2a8d21b39fc243fef93 (diff)
parent1e050eabb622ca60640e4714b01cb3caa29505f0 (diff)
Merge remote-tracking branches 'regulator/topic/fixed', 'regulator/topic/id-const', 'regulator/topic/ltc3589', 'regulator/topic/max8649' and 'regulator/topic/of' into regulator-next