From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 10 Dec 2018 03:50:34 +0000 (+1100)
Subject: Merge remote-tracking branch 'battery/for-next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6931ac9af7b2183dc6ff29199c46fd5e5be3340f;p=users%2Fwilly%2Flinux.git

Merge remote-tracking branch 'battery/for-next'
---

6931ac9af7b2183dc6ff29199c46fd5e5be3340f