From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sun, 15 Jul 2007 23:56:12 +0000 (-0700)
Subject: Merge git://git.infradead.org/battery-2.6
X-Git-Tag: firefly_0821_release~28248
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8f41958bdd577731f7411c9605cfaa9db6766809;p=firefly-linux-kernel-4.4.55.git

Merge git://git.infradead.org/battery-2.6

* git://git.infradead.org/battery-2.6:
  git-battery vs git-acpi
  Power supply class and drivers: remove non obligatory return statements
  pda_power: clean up irq, timer
  MAINTAINERS: Add maintainers for power supply subsystem and drivers

Fixed up trivial conflict in drivers/w1/slaves/w1_ds2760.c manually
---

8f41958bdd577731f7411c9605cfaa9db6766809