From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Aug 2010 16:58:33 +0000 (-0700)
Subject: Merge git://git.infradead.org/battery-2.6
X-Git-Tag: v2.6.36-rc1~61
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16bb85bc12e7d0b066b1471185f3889cb1ceb382;p=pandora-kernel.git

Merge git://git.infradead.org/battery-2.6

* git://git.infradead.org/battery-2.6:
  intel_mid_battery: Fix battery scaling
  intel_mid_battery: Fix the argument order to intel_scu_ipc_command
  olpc_battery: Fix build failure caused by sysfs changes
  Add s3c-adc-battery driver
  Intel MID platform battery driver

Fix up trivial conflicts (battery drivers added from different branches)
in drivers/power/{Kconfig,Makefile}
---

16bb85bc12e7d0b066b1471185f3889cb1ceb382
Reading git-diff-tree failed