tree 3422ed473f0185936fa2c11261490f199fb6586e
parent 79af3133174da620171eea82bb505a5a5cb7c6f4
parent bfdb46ce8494eae30dbaae65c81e684e6db6228b
author Linus Torvalds <torvalds@linux-foundation.org> 1248997553 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1248997553 -0700

Merge git://git.infradead.org/users/cbou/battery-2.6.31

* git://git.infradead.org/users/cbou/battery-2.6.31:
  Add ds2782 battery gas gauge driver
  olpc_battery: Ensure that the TRICKLE bit is checked
  olpc_battery: Fix up eeprom read function