diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-24 12:01:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-24 12:01:58 -0700 |
| commit | 76429f1dedbc1815d875c9b68eefd30c95cb8fa9 (patch) | |
| tree | 0c7efa089ad10e6c503b9c3a5ccc6735ceb11ad3 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge tag 'spi-v3.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi (diff) | |
| parent | Merge remote-tracking branch 'regulator/fix/pbias' into regulator-linus (diff) | |
| download | wireguard-linux-76429f1dedbc1815d875c9b68eefd30c95cb8fa9.tar.xz wireguard-linux-76429f1dedbc1815d875c9b68eefd30c95cb8fa9.zip | |
Merge tag 'regulator-v3.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fixes from Mark Brown:
"A couple of things here:
- Fixes for pbias that didn't make it in during the merge window due
to the driver coming in via MMC. The conversion to use helpers is
a fix as it implements list_voltage() which the main user (MMC)
relies on for correct functioning.
- Change the !REGULATOR stub for optional regulators to return an
error rather than a dummy; this is more in keeping with the
intended use of optional regulators and fixes some issues seen MMC
where it got confused by a dummy being provided"
* tag 'regulator-v3.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: core: Return error in get optional stub
regulator: pbias: Convert to use regmap helper functions
regulator: pbias: Fix is_enabled callback implementation
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions