Merge tag 'for-v3.8-merged' of git://git.infradead.org/battery-2.6