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