diff options
author | 2009-04-08 17:45:02 -0700 | |
---|---|---|
committer | 2009-04-08 17:45:02 -0700 | |
commit | d8312204768861d77ec868265b2c1a36a1bf078f (patch) | |
tree | 0cc1f5b0c37ada436b5cff49f9c5f481990a7dec /kernel/posix-cpu-timers.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 (diff) | |
parent | pda_power: Add optional OTG transceiver and voltage regulator support (diff) | |
download | linux-rng-d8312204768861d77ec868265b2c1a36a1bf078f.tar.xz linux-rng-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 'kernel/posix-cpu-timers.c')
0 files changed, 0 insertions, 0 deletions