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)
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
1  2 
drivers/power/supply/Kconfig

Simple merge