diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-17 17:47:06 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-17 17:47:06 (GMT) |
commit | 8e6e44fbd230b12c34c9166ec49f63a5bd6018b7 (patch) | |
tree | f1aa2952cbbf337520856e21914a1609c6ae09ab /lib/fonts/font_6x11.c | |
parent | 529d2eb6795cf899c1c5fd419c3313a94ca5ba4d (diff) | |
parent | 8ca8f32666d2a655e274836400e1a7f7fa313502 (diff) | |
download | linux-8e6e44fbd230b12c34c9166ec49f63a5bd6018b7.tar.xz |
Merge tag 'regulator-fix-v4.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fixes from Mark Brown:
"The two main fixes here from Javier and Doug both fix issues seen on
the Exynos-based ARM Chromebooks with reference counting of GPIO
regulators over system suspend. The GPIO enable code didn't properly
take account of this case (a full analysis is in Doug's commit log).
This is fixed by both fixing the reference counting directly and by
making the resume code skip enables it doesn't need to do. We could
skip the change in the resume code but it's a very simple change and
adds extra robustness against problems in other drivers"
* tag 'regulator-fix-v4.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: tps65910: Add missing #include <linux/of.h>
regulator: core: Fix enable GPIO reference counting
regulator: Only enable disabled regulators on resume
Diffstat (limited to 'lib/fonts/font_6x11.c')
0 files changed, 0 insertions, 0 deletions