diff options
author | 2015-10-07 14:11:47 +0100 | |
---|---|---|
committer | 2015-10-07 14:11:47 +0100 | |
commit | 21f3c96188f1a1e592174bef3180d147e06f7b89 (patch) | |
tree | 8d35b5caf18798c1550bff7cabc4b828945b1c32 /tools/perf/scripts/python/stackcollapse.py | |
parent | Merge branch 'strscpy' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile (diff) | |
parent | Merge remote-tracking branch 'regulator/fix/axp20x' into regulator-linus (diff) | |
download | linux-dev-21f3c96188f1a1e592174bef3180d147e06f7b89.tar.xz linux-dev-21f3c96188f1a1e592174bef3180d147e06f7b89.zip |
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 'tools/perf/scripts/python/stackcollapse.py')
0 files changed, 0 insertions, 0 deletions