Merge branch 'psy-w1-for-v4.14-immutable' into for-next
authorSebastian Reichel <sebastian.reichel@collabora.co.uk>
Tue, 25 Jul 2017 13:18:27 +0000 (15:18 +0200)
committerSebastian Reichel <sebastian.reichel@collabora.co.uk>
Tue, 25 Jul 2017 13:18:27 +0000 (15:18 +0200)
commitc8143b72888c551bc4119f52d818343945f969d4
tree3248876df339288a05fdafa8b5e78d8a3295bb01
parent17825ff6ec6db23892e61a1496abf7d737afe9e7
parent55a9db679183bcf85a6e5c44a4f92f158bb6f03d
Merge branch 'psy-w1-for-v4.14-immutable' into for-next

Merge immutable branch moving bq27000 driver from w1 subsystem
into power-supply subsystem.

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