aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-02-04 12:58:19 +0000
committerMark Brown <broonie@linaro.org>2014-02-04 12:58:19 +0000
commita6a671e1b6f6e68b642445ad3cac46f8ffb46f5c (patch)
treea9ca9df4d27c31cc9381411c3b6a4f74f3c29f92 /drivers
parentMerge remote-tracking branch 'regulator/fix/core' into regulator-linus (diff)
parentregulator: ab3100: cast fix (diff)
parentregulator: s2mps11: Fix NULL pointer of_node value when using platform data (diff)
downloadlinux-dev-a6a671e1b6f6e68b642445ad3cac46f8ffb46f5c.tar.xz
linux-dev-a6a671e1b6f6e68b642445ad3cac46f8ffb46f5c.zip
Merge remote-tracking branches 'regulator/fix/ab3100' and 'regulator/fix/s2mps11' into regulator-linus