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