Merge git://git.infradead.org/users/cbou/battery-2.6.35
Linus Torvalds [Tue, 27 Jul 2010 16:22:55 +0000 (09:22 -0700)]
* git://git.infradead.org/users/cbou/battery-2.6.35:
  ds2782_battery: Rename get_current to fix build failure / name conflict

1  2 
drivers/power/ds2782_battery.c

Simple merge