From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 27 Jul 2010 16:22:55 +0000 (-0700)
Subject: Merge git://git.infradead.org/users/cbou/battery-2.6.35
X-Git-Tag: v2.6.35~24
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=02e7cce2bc3ac82b971d1efe489f23ca0b6e1d4a;p=cascardo%2Flinux.git

Merge git://git.infradead.org/users/cbou/battery-2.6.35

* git://git.infradead.org/users/cbou/battery-2.6.35:
  ds2782_battery: Rename get_current to fix build failure / name conflict
---

02e7cce2bc3ac82b971d1efe489f23ca0b6e1d4a