diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 18:44:30 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 18:44:30 +0200 |
commit | 7d67474e506598fe26e0c262acf02132dc730517 (patch) | |
tree | 45ad83d853a1a461f8c86b964861336e4e913851 /drivers/i2c | |
parent | epca: Add infinite break support (diff) | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval... (diff) | |
download | linux-7d67474e506598fe26e0c262acf02132dc730517.tar.xz linux-7d67474e506598fe26e0c262acf02132dc730517.zip |
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
Diffstat (limited to 'drivers/i2c')
0 files changed, 0 insertions, 0 deletions