diff options
| author | Linus Torvalds <[email protected]> | 2009-04-09 00:45:02 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2009-04-09 00:45:02 +0000 |
| commit | d8312204768861d77ec868265b2c1a36a1bf078f (patch) | |
| tree | 0cc1f5b0c37ada436b5cff49f9c5f481990a7dec /fs/proc/array.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo... (diff) | |
| parent | pda_power: Add optional OTG transceiver and voltage regulator support (diff) | |
| download | kernel-d8312204768861d77ec868265b2c1a36a1bf078f.tar.gz kernel-d8312204768861d77ec868265b2c1a36a1bf078f.zip | |
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
Diffstat (limited to 'fs/proc/array.c')
0 files changed, 0 insertions, 0 deletions