diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 11:13:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 11:13:00 -0700 |
| commit | 7d3107d26b522a0fe92af6279256fa65fe3db771 (patch) | |
| tree | 9c9fd7653737c6725752033421344579e2679aa4 /MAINTAINERS | |
| parent | 3aa78e0cb5c9b8b4ed2a617bb1e1542bfb508379 (diff) | |
| parent | 5a6c2208455f25b3e6f939adc2da59aa00d4806e (diff) | |
Merge tag 'for-v3.11' of git://git.infradead.org/battery-2.6
Pull battery subsystem update from Anton Vorontsov:
"Nothing exciting this time, just assorted fixes and cleanups"
* tag 'for-v3.11' of git://git.infradead.org/battery-2.6: (25 commits)
charger-manager: Fix regulator_get() return check
charger-manager: Fix a bug when it unregisters notifier block of extcon
tps65090-charger: Add dt node to power_supply
sbs-battery: Add dt to power_supply struct
power_supply: Add of_node_put to fix refcount
power_supply: Move of_node out of the #ifdef CONFIG_OF
power/reset: Make the vexpress driver optional on arm and arm64
charger-manager: Add missing newlines, fix a couple of typos, add pr_fmt
tps65090-charger: Fix AC detect
MAINTAINERS: Update email address for Anton Vorontsov
charger-manager: Ensure event is not used as format string
power_supply: Replace strict_strtoul() with kstrtoul()
generic-adc-battery: Fix checking if none of the channels are supported
power: Use platform_{get,set}_drvdata()
pm2301_charger: Return error if create_singlethread_workqueue fails
pm2301_charger: Fix NULL pointer dereference
lp8727_charger: Support the device tree feature
twl4030_charger: Remove unnecessary platform_set_drvdata()
rx51_battery: Remove unnecessary platform_set_drvdata()
jz4740-battery: Remove unnecessary platform_set_drvdata()
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index bb700731dcf..3c433aec12d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -752,7 +752,7 @@ S: Maintained F: arch/arm/mach-highbank/ ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT -M: Anton Vorontsov <avorontsov@mvista.com> +M: Anton Vorontsov <anton@enomsg.org> S: Maintained F: arch/arm/mach-cns3xxx/ T: git git://git.infradead.org/users/cbou/linux-cns3xxx.git @@ -6406,7 +6406,7 @@ F: include/linux/timer* F: kernel/*timer* POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS -M: Anton Vorontsov <cbou@mail.ru> +M: Anton Vorontsov <anton@enomsg.org> M: David Woodhouse <dwmw2@infradead.org> T: git git://git.infradead.org/battery-2.6.git S: Maintained @@ -6516,7 +6516,7 @@ S: Maintained F: drivers/block/ps3vram.c PSTORE FILESYSTEM -M: Anton Vorontsov <cbouatmailru@gmail.com> +M: Anton Vorontsov <anton@enomsg.org> M: Colin Cross <ccross@android.com> M: Kees Cook <keescook@chromium.org> M: Tony Luck <tony.luck@intel.com> @@ -7214,7 +7214,7 @@ F: drivers/mmc/host/sdhci.* F: drivers/mmc/host/sdhci-pltfm.[ch] SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF) -M: Anton Vorontsov <avorontsov@ru.mvista.com> +M: Anton Vorontsov <anton@enomsg.org> L: linuxppc-dev@lists.ozlabs.org L: linux-mmc@vger.kernel.org S: Maintained |