]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
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)
* git://git.infradead.org/battery-2.6:
  pmu_battery: Fix battery full reporting


Trivial merge