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)
* git://git.infradead.org/users/cbou/battery-2.6.35:
  ds2782_battery: Fix ds2782_get_capacity return value


Trivial merge