Merge git://git.infradead.org/battery-2.6