summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-03-16 12:43:24 +0100
committerMark Brown <broonie@kernel.org>2015-03-16 12:43:24 +0100
commit8ca8f32666d2a655e274836400e1a7f7fa313502 (patch)
tree08be968aeda653fe1d7b1c7bbb90a4511d264525 /kernel
parentLinux 4.0-rc4 (diff)
parentregulator: core: Fix enable GPIO reference counting (diff)
parentregulator: tps65910: Add missing #include <linux/of.h> (diff)
downloadlinux-8ca8f32666d2a655e274836400e1a7f7fa313502.tar.xz
linux-8ca8f32666d2a655e274836400e1a7f7fa313502.zip
Merge remote-tracking branches 'regulator/fix/gpio-enable' and 'regulator/fix/tps65910' into regulator-linus