OSDN Git Service

Merge "qcom-charger: smb138x-charger: add parallel enable status properties"
authorLinux Build Service Account <lnxbuild@localhost>
Thu, 11 Aug 2016 19:48:35 +0000 (12:48 -0700)
committerGerrit - the friendly Code Review server <code-review@localhost>
Thu, 11 Aug 2016 19:48:35 +0000 (12:48 -0700)
1  2 
drivers/power/power_supply_sysfs.c
drivers/power/qcom-charger/smb138x-charger.c
include/linux/power_supply.h

Simple merge
Simple merge