summaryrefslogtreecommitdiff
path: root/fs/fuse
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-09 00:45:02 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-09 00:45:02 (GMT)
commitd8312204768861d77ec868265b2c1a36a1bf078f (patch)
tree0cc1f5b0c37ada436b5cff49f9c5f481990a7dec /fs/fuse
parent3d4d4c8bb63a705d95a46d299469d8a10b8b229c (diff)
parent5bf2b994bfe11bfe86231050897b2d881ca544d9 (diff)
downloadlinux-fsl-qoriq-d8312204768861d77ec868265b2c1a36a1bf078f.tar.xz
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/fuse')
0 files changed, 0 insertions, 0 deletions