From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 9 Apr 2009 00:45:02 +0000 (-0700)
Subject: Merge git://git.infradead.org/battery-2.6
X-Git-Tag: v2.6.30-rc2~107
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=d8312204768861d77ec868265b2c1a36a1bf078f

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

* git://git.infradead.org/battery-2.6:
  pda_power: Add optional OTG transceiver and voltage regulator support
  pcf50633_charger: Remove unused mbc_set_status function
  pcf50633_charger: Enable periodic charging restart
---

d8312204768861d77ec868265b2c1a36a1bf078f