Merge git://git.infradead.org/users/cbou/battery-2.6.31
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Jul 2009 23:45:53 +0000 (16:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Jul 2009 23:45:53 +0000 (16:45 -0700)
commitfbdbf8389976b9f40d36f21985be28a0f438f779
tree3422ed473f0185936fa2c11261490f199fb6586e
parent79af3133174da620171eea82bb505a5a5cb7c6f4
parentbfdb46ce8494eae30dbaae65c81e684e6db6228b
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