summaryrefslogtreecommitdiff
path: root/fs/nfsd
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-12 21:13:06 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-12 21:13:06 -0800
commit53ff7095cce683813be075379160b8e4e6ea8b85 (patch)
tree723754032e6eb42af3f555946b9786900a8f659c /fs/nfsd
parentbb7d3f24c71e528989501617651b669fbed798cb (diff)
parentd54e7929d8073b0fff8af16f8ff6ebbba6fc4154 (diff)
downloadlinux-3.10-53ff7095cce683813be075379160b8e4e6ea8b85.tar.gz
linux-3.10-53ff7095cce683813be075379160b8e4e6ea8b85.tar.bz2
linux-3.10-53ff7095cce683813be075379160b8e4e6ea8b85.zip
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6: pmu_battery: Fix battery full reporting
Diffstat (limited to 'fs/nfsd')
0 files changed, 0 insertions, 0 deletions