projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 79af313 bfdb46c)
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)
* 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


Trivial merge
John Crispins staging tree