diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-13 14:20:43 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-13 14:20:43 -0800 |
commit | 3b582f393150c72b18339bc00d7ed4fb22445ed1 (patch) | |
tree | ee4bfeb036cfdfe1b47d38c1177d69d2f70ba2b9 /drivers/power/tosa_battery.c | |
parent | 19be13cfe37006bf90a61f6cb65ab8cb936099f3 (diff) | |
parent | 455a0e2cd80f7a2849b2e6d3be85c053ee44446b (diff) | |
download | blackbird-op-linux-3b582f393150c72b18339bc00d7ed4fb22445ed1.tar.gz blackbird-op-linux-3b582f393150c72b18339bc00d7ed4fb22445ed1.zip |
Merge tag 'battery-fixes-for-v3.3-rc2' of git://git.infradead.org/users/cbou/battery-urgent
Just a few small fixes for a bunch of drivers. Nothing noteworthy.
* tag 'battery-fixes-for-v3.3-rc2' of git://git.infradead.org/users/cbou/battery-urgent:
lp8727_charger: Add terminating entry for i2c_device_id table
power_supply: Fix modalias for charger-manager
lp8727_chager: Fix permissions on a header file
bq27x00_battery: Fix flag register read
Revert "bq27x00_battery: Fix reporting status value for bq27500 battery"
Diffstat (limited to 'drivers/power/tosa_battery.c')
0 files changed, 0 insertions, 0 deletions