From: Linus Torvalds Date: Wed, 7 Oct 2015 13:11:47 +0000 (+0100) Subject: Merge tag 'regulator-fix-v4.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: drm-fsl-dcu-for-next~2399 X-Git-Url: http://git.agner.ch/gitweb/?p=linux-drm-fsl-dcu.git;a=commitdiff_plain;h=21f3c96188f1a1e592174bef3180d147e06f7b89 Merge tag 'regulator-fix-v4.3-rc4' of git://git./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 --- 21f3c96188f1a1e592174bef3180d147e06f7b89