Merge git://git.infradead.org/users/cbou/battery-2.6.35
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Jul 2010 15:22:15 +0000 (08:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Jul 2010 15:22:15 +0000 (08:22 -0700)
commit19f0f0af097ba3138ae2780b471180512763a78f
tree239c0dd5b728cd9c52cbf01777083382b20d95de
parent620d0be88188cd3dc79db3f5eab1420d6f97c70c
parent2d31757c87a741823f77daaa07eeb8d56be63943
Merge git://git.infradead.org/users/cbou/battery-2.6.35

* git://git.infradead.org/users/cbou/battery-2.6.35:
  ds2782_battery: Fix ds2782_get_capacity return value