commit | d8312204768861d77ec868265b2c1a36a1bf078f | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 08 17:45:02 2009 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 08 17:45:02 2009 -0700 |
tree | 0cc1f5b0c37ada436b5cff49f9c5f481990a7dec | |
parent | 3d4d4c8bb63a705d95a46d299469d8a10b8b229c [diff] | |
parent | 5bf2b994bfe11bfe86231050897b2d881ca544d9 [diff] |
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