diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-12 21:13:06 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-12 21:13:06 -0800 |
commit | 53ff7095cce683813be075379160b8e4e6ea8b85 (patch) | |
tree | 723754032e6eb42af3f555946b9786900a8f659c /fs/nfsd | |
parent | bb7d3f24c71e528989501617651b669fbed798cb (diff) | |
parent | d54e7929d8073b0fff8af16f8ff6ebbba6fc4154 (diff) | |
download | linux-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