From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Oct 2008 16:44:30 +0000 (-0700)
Subject: Merge git://git.infradead.org/battery-2.6
X-Git-Tag: Ubuntu-5.0.0-8.9~30499
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7d67474e506598fe26e0c262acf02132dc730517;p=mirror_ubuntu-disco-kernel.git

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

* git://git.infradead.org/battery-2.6:
  bq27x00_battery: use unaligned access helper
  power_supply: fix dependency of tosa_battery
  power_supply: Support for Texas Instruments BQ27200 battery managers
  power_supply: Add function to return system-wide power state
  pda_power: Check and handle return value of set_irq_wake
---

7d67474e506598fe26e0c262acf02132dc730517