summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/da9211-regulator.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-09-30 14:50:25 +0200
committerMark Brown <broonie@kernel.org>2014-09-30 14:50:25 +0200
commit95528a55dba0360b5342d9c7369e69a772717b7b (patch)
tree3b952a08c4d677aa0e3a8829b8bb9f0731193bd6 /drivers/regulator/da9211-regulator.c
parentMerge remote-tracking branch 'regulator/topic/core' into regulator-next (diff)
parentregulator: as3711: Remove unused fields from as3711_regulator_info and as3711... (diff)
parentregulator: axp20x: Use parent device as regulator configuration device (diff)
parentregulator: bcm590xx: Remove unused **info field from struct bcm590xx_reg (diff)
parentregulator: da9211: Set of_match_table and export device table (diff)
downloadlinux-95528a55dba0360b5342d9c7369e69a772717b7b.tar.xz
linux-95528a55dba0360b5342d9c7369e69a772717b7b.zip
Merge remote-tracking branches 'regulator/topic/as3711', 'regulator/topic/axp20x', 'regulator/topic/bcm590xx' and 'regulator/topic/da9211' into regulator-next