From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 20 Jul 2010 15:22:15 +0000 (-0700)
Subject: Merge git://git.infradead.org/users/cbou/battery-2.6.35
X-Git-Tag: v2.6.35-rc6~25
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=19f0f0af097ba3138ae2780b471180512763a78f;p=~shefty%2Frdma-dev.git

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
---

19f0f0af097ba3138ae2780b471180512763a78f