tree 239c0dd5b728cd9c52cbf01777083382b20d95de
parent 620d0be88188cd3dc79db3f5eab1420d6f97c70c
parent 2d31757c87a741823f77daaa07eeb8d56be63943
author Linus Torvalds <torvalds@linux-foundation.org> 1279639335 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1279639335 -0700

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