aboutsummaryrefslogtreecommitdiff
path: root/include/linux/mfd
diff options
context:
space:
mode:
authorMark Brown2016-05-13 14:23:46 +0100
committerMark Brown2016-05-13 14:23:46 +0100
commit39d652e0660bbad6a90a21042dc9f22584dfaabd (patch)
tree19267e578a84c46aa34ff09fffd32763e6497fd3 /include/linux/mfd
parenteb76d8407ced8d96eb3bcf3112348b8de5bd1c02 (diff)
parentbc0868c62bb13834b20a864f684cced1f84a2412 (diff)
parentb1d21a24df458c897911af51cb637460c1ac5d95 (diff)
parent9e9daa0a67d59df432664cdca1cf4659057fd00c (diff)
parent94be46b9e5e2954b6d5962750f8aae8b5f099baa (diff)
Merge remote-tracking branches 'regulator/topic/pwm', 'regulator/topic/qcom-spmi', 'regulator/topic/rk808' and 'regulator/topic/s2mps11' into regulator-next