Skip to contentSkip to conversation

battery-2.6.git

GIT PULL Anton Vorontsov 1 participant 1 message Aug 11, 2010

lore
Share & tools
lore
#0 lore raw

Hello Linus,

Please pull battery-2.6.git tree to receive changes prepared for 2.6.36.

Thanks!

The following changes since commit eb9650d6d989f24f21232a055d8fd45f1a9dcf99:
Peter Huewe (1):
ds2782_battery: Rename get_current to fix build failure / name conflict

are available in the git repository at:

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

Alan Cox (1):
intel_mid_battery: Fix battery scaling

Arjan van de Ven (1):
intel_mid_battery: Fix the argument order to intel_scu_ipc_command

David Woodhouse (1):
olpc_battery: Fix build failure caused by sysfs changes

Nithish Mahalingam (1):
Intel MID platform battery driver

Vasily Khoruzhick (1):
Add s3c-adc-battery driver

 drivers/power/Kconfig             |   13 +
 drivers/power/Makefile            |    2 +
 drivers/power/intel_mid_battery.c |  799 +++++++++++++++++++++++++++++++++++++
 drivers/power/olpc_battery.c      |    3 +-
 drivers/power/s3c_adc_battery.c   |  431 ++++++++++++++++++++
 include/linux/s3c_adc_battery.h   |   36 ++
 6 files changed, 1282 insertions(+), 2 deletions(-)
 create mode 100644 drivers/power/intel_mid_battery.c
 create mode 100644 drivers/power/s3c_adc_battery.c
 create mode 100644 include/linux/s3c_adc_battery.h