diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-07 14:11:47 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-07 14:11:47 +0100 |
| commit | 21f3c96188f1a1e592174bef3180d147e06f7b89 (patch) | |
| tree | 8d35b5caf18798c1550bff7cabc4b828945b1c32 /drivers/scsi/3w-sas.h | |
| parent | 79c7c7acd25689b1d7669bdb33fb3cb7c64541fe (diff) | |
| parent | 22ca03a3ad63bb08d543af462b741b6bf2c329ed (diff) | |
Merge tag 'regulator-fix-v4.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fixes from Mark Brown:
"Two fixes here, one device specific fix for axp20x and a core fix for
cases where one regulator is supplying another which broke probe
deferral, substituting in a dummy regulator too aggressively"
* tag 'regulator-fix-v4.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: core: Handle probe deferral from DT when resolving supplies
regulator: axp20x: Fix enable bit indexes for DCDC4 and DCDC5
Diffstat (limited to 'drivers/scsi/3w-sas.h')
0 files changed, 0 insertions, 0 deletions