Merge git://git.infradead.org/battery-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Jan 2010 05:13:06 +0000 (21:13 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Jan 2010 05:13:06 +0000 (21:13 -0800)
commit53ff7095cce683813be075379160b8e4e6ea8b85
tree723754032e6eb42af3f555946b9786900a8f659c
parentbb7d3f24c71e528989501617651b669fbed798cb
parentd54e7929d8073b0fff8af16f8ff6ebbba6fc4154
Merge git://git.infradead.org/battery-2.6

* git://git.infradead.org/battery-2.6:
  pmu_battery: Fix battery full reporting