diff options
author | Mark Brown <broonie@linaro.org> | 2014-06-02 17:08:03 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-06-02 17:08:03 +0100 |
commit | 8ff15e0909e3e369c0ba8037901bb76ba5d82d47 (patch) | |
tree | a2e7581e9376931dc52632fd2a7c747af17e5965 /include/uapi/linux/fuse.h | |
parent | 42398dbdea411eec0ec3d469df0eeb2e4089d9ab (diff) | |
parent | 7b22b9a5aba1eeda05d4b08c8b1c70c9ba385e82 (diff) | |
parent | b88703567b6ca3fc183b22eb5e852b4bf5679d72 (diff) | |
parent | bfbc344732badffe94f096f929e4a105b3b92d1f (diff) |
Merge remote-tracking branches 'regulator/topic/arizona', 'regulator/topic/axp20' and 'regulator/topic/bcm590xx' into regulator-next