From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 30 Jul 2009 23:45:53 +0000 (-0700)
Subject: Merge git://git.infradead.org/users/cbou/battery-2.6.31
X-Git-Tag: v2.6.31-rc5~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fbdbf8389976b9f40d36f21985be28a0f438f779;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

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

* git://git.infradead.org/users/cbou/battery-2.6.31:
  Add ds2782 battery gas gauge driver
  olpc_battery: Ensure that the TRICKLE bit is checked
  olpc_battery: Fix up eeprom read function
---

fbdbf8389976b9f40d36f21985be28a0f438f779