]> www.infradead.org Git - linux.git/commitdiff
projects / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 17825ff 55a9db6)
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)
Merge immutable branch moving bq27000 driver from w1 subsystem
into power-supply subsystem.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
1  2 
drivers/power/supply/Kconfig patch | diff1 | diff2 | blob | history
drivers/power/supply/Makefile patch | diff1 | diff2 | blob | history

diff --cc drivers/power/supply/Kconfig
Simple merge
diff --cc drivers/power/supply/Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.