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)
commit5abea2b1d9213da52f8f3b1aa21770f65947a757
tree20a8356b9b2095e1ec3c182c28de1353394e6a57
parent744bdc65462b89d1b77e4e96ce4a19f810f6302d
parent081e422149b9a683d859fc79023ce0948328b4bc
Merge "qcom-charger: smb138x-charger: add parallel enable status properties"
drivers/power/power_supply_sysfs.c
drivers/power/qcom-charger/smb138x-charger.c
include/linux/power_supply.h