Merge branch 'fixes' into for-next
authorSebastian Reichel <sebastian.reichel@collabora.co.uk>
Mon, 24 Jul 2017 17:42:43 +0000 (19:42 +0200)
committerSebastian Reichel <sebastian.reichel@collabora.co.uk>
Mon, 24 Jul 2017 18:53:15 +0000 (20:53 +0200)
commitd4e2385c691101d0bf412f7c5fecfc279eb919c7
tree6ea4384bb663d7114c3a17f5b11e61442bdd43fa
parent10e48b7d73487114bdd13bc1ebd10b6ba62de25b
parent648b8eba20d0bdce9de41df97677e70aa53693ea
Merge branch 'fixes' into for-next

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
drivers/power/supply/Kconfig