summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-02-04 16:58:19 +0400
committerMark Brown <broonie@linaro.org>2014-02-04 16:58:19 +0400
commita6a671e1b6f6e68b642445ad3cac46f8ffb46f5c (patch)
treea9ca9df4d27c31cc9381411c3b6a4f74f3c29f92 /drivers
parent00e674702438b8b2abc9dd6b8b49d54a3e99baa7 (diff)
parent23e21ddf6c3d9cb37aa69da496f80e8481e2c8bd (diff)
parent54820f5802295993b78a373e404e7561039b399d (diff)
downloadlinux-a6a671e1b6f6e68b642445ad3cac46f8ffb46f5c.tar.xz
Merge remote-tracking branches 'regulator/fix/ab3100' and 'regulator/fix/s2mps11' into regulator-linus