Merge tag 'for-v4.1-rc' of git://git.infradead.org/battery-2.6