summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-09-05 10:53:18 +0100
committerMark Brown <broonie@kernel.org>2014-09-05 10:53:18 +0100
commita65c86630632c534e9dd3cf76c1c5a5c98970873 (patch)
tree386581ac1425454d457b84838ebaffa0e1a0c807 /include
parent69e273c0b0a3c337a521d083374c918dc52c666f (diff)
parenta8dbfeedfe47a19a4712749eb2444b1d7ea1150e (diff)
parenta4e2dec0d7479232df330dad60fd00ee94767381 (diff)
Merge remote-tracking branches 'regulator/fix/doc' and 'regulator/fix/tps65090' into regulator-linus