From: Linus Torvalds Date: Tue, 1 Nov 2011 22:06:20 +0000 (-0700) Subject: Merge branch 'for-linus' of git://opensource.wolfsonmicro.com/regulator X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f3c3f0670501fee130f22193369249deea8cc630;p=deliverable%2Flinux.git Merge branch 'for-linus' of git://opensource.wolfsonmicro.com/regulator * 'for-linus' of git://opensource.wolfsonmicro.com/regulator: (22 commits) regulator: Constify constraints name regulator: Fix possible nullpointer dereference in regulator_enable() regulator: gpio-regulator add dependency on GENERIC_GPIO regulator: Add module.h include to gpio-regulator regulator: Add driver for gpio-controlled regulators regulator: remove duplicate REG_CTRL2 defines in tps65023 regulator: Clarify documentation for regulator-regulator supplies regulator: Fix some bitrot in the machine driver documentation regulator: tps65023: Added support for the similiar TPS65020 chip regulator: tps65023: Setting correct core regulator for tps65021 regulator: tps65023: Set missing bit for update core-voltage regulator: tps65023: Fixes i2c configuration issues regulator: Add debugfs file showing the supply map table regulator: tps6586x: add SMx slew rate setting regulator: tps65023: Fixes i2c configuration issues regulator: tps6507x: Remove num_voltages array regulator: max8952: removed unused mutex. regulator: fix regulator/consumer.h kernel-doc warning regulator: Ensure enough enable time for max8649 regulator: 88pm8607: Fix off-by-one value range checking in the case of no id is matched ... --- f3c3f0670501fee130f22193369249deea8cc630