From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 27 May 2011 17:12:35 +0000 (-0700)
Subject: Merge git://git.infradead.org/battery-2.6
X-Git-Tag: v3.0-rc1~49
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=ea0ca3a843babd50c22dfbb5cf2d9a14df821b2b

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

* git://git.infradead.org/battery-2.6:
  PXA: Use dev_pm_ops in z2_battery
  ds2760_battery: Fix rated capacity of the hx4700 1800mAh battery
  ds2760_battery: Fix indexing of the 4 active full EEPROM registers
  power: Make test_power driver more dynamic.
  bq27x00_battery: Name of cycle count property
  max8903_charger: Add GENERIC_HARDIRQS as a dependency (fixes S390 build)
  ARM: RX-51: Enable isp1704 power on/off
  isp1704_charger: Allow board specific powering routine
  gpio-charger: Add gpio_charger_resume
  power_supply: Add driver for MAX8903 charger
---

ea0ca3a843babd50c22dfbb5cf2d9a14df821b2b