diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-19 08:14:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-19 08:14:08 -0800 |
| commit | 5031a2a7c12b837a0913c4139ebeb6bbff5e1aa5 (patch) | |
| tree | 17d870e89554f0e7ad66029c41f3477ebc371eff /block/genhd.c | |
| parent | 7a684c452e2589f3ddd7e2d466b4f747d3715ad9 (diff) | |
| parent | f36b9ddbab408f5f5ed9105d857189b84337af48 (diff) | |
| download | linux-5031a2a7c12b837a0913c4139ebeb6bbff5e1aa5.tar.bz2 | |
Merge tag 'for-v3.8-part2' of git://git.infradead.org/battery-2.6
Pull battery update, part 2, from Anton Vorontsov:
"These are left overs that I didn't have time to review/apply before
the merge window opened. I didn't want to "spoil" the first pull
request with these late patches, so they were not included:
- A small patch for the RX51 OMAP board (Nokia N900 phone), the patch
creates a battery monitor device instance, so that it can be
probed. It was acked by the OMAP maintainer;
- A couple of late bug fixes for the charger-manager: corrects corner
cases for the battery full handling."
* tag 'for-v3.8-part2' of git://git.infradead.org/battery-2.6:
charger-manager: Fix bug when check dropped voltage after fullbatt event
charger-manager: Fix bug related to checking fully charged state of battery
ARM: OMAP: rx51: Register platform device for rx51_battery
Diffstat (limited to 'block/genhd.c')
0 files changed, 0 insertions, 0 deletions